Associations

Changed some associations