Updated parsers, new cmd line interface