Update models and associations