Don't you have to apply the same logic to the new DB connector too?