[TASK] Update Models Association Mapping