More strict command line parsing