Deprecated model, entity naming convention changed
Fixed loading of sub-entities