Updated command line parser to accept more input formats.