updated models and associations