Changed to shared db singlton