added and modified model associations on model files