some ORM changes