Fix for Change in CanaryLib's Database api