Reverted ReferenceMapper changes, as now fixed DefaultDBCallback