Made parsers Parser compliant