Ported majority of types over to new meta-model.