DB design modified