Added associations and new migrations