Parser replaced with a PegJS based implementation