Less hardcoding, -d & -f options in remote mode