Add CLI switches