Fix to ORM registration and RTEs

Centralized Model entity and type registrations
Fixed RTE with model instances