added in new models with associations