Updated models with associations