Added ORM hooks