New version with regex parsers for commands