Switchers for calling via command line added