Implemented more command line options