added many-to-many and one-to-many relationships