Transforming this project to ORM