Adding ORM and modifying model