Add references mapping back
Fix House / Property entity