Added ORM callbacks