Need a couple extra steps on the enum_parent_entity_type

[GR-38]