Added EntityBuilder to instantiate original entity types