DB design updated.