Type parsing dev merge