Try to support database locations again