Updated to use new double/float DB functions