DB schema redesign.