Make HasOne relations map to singular fields