Added some associations