Added many-to-many relationships to ORM