Changes in DB design and some changes.