added some associations and foreign keys