Added CLI to enable/disable parser, etc.