More changes for dual databases