Added some ORM support