Updated models and relations