WIP commit of parser template extensions