Adding ORM support
Adding ORM support