Finalized move to new mgen-api and parser api