Fix for the models and relations