Adding ORM support