db entity redesign