Added one-to-many relationships to ORM