Extend parser for use