Updated command line parser