Fixed enum names
Command line parsing