updated models and relationships