Fix model relationships