Add support for legacy parser, relax parse restrictions