Added alternative parser