Add mappedBy population functionality