Converted model variables to ORM