More shifts to RefDB