Adjust code to reflect DB split.