Created join tables and modified some of the model relationships