More DB related changes