Some DB related changes