fixed associations and added collections controller