Added CLI switches

Added default CLI Switches