Switched from compilation-switched to command line argument based modes