Removing customizations from ORM core.  Migrated to decorator