Add local only option
Fix argument checking