Rewrite of the command line parser