You should keep EntityMetadataWrapper, as the wrapper also a property, not just an entity.