Added associations and foreign keys