Update model associations
Add Scopes