Modified command line class