DB layout redesign.