Adding option to not expand paths