Merge "Move all of the reasonable DatabaseBase methods to Database class"