Modified the database structure

Change-Id: Ia58c160b281ab928cd66815b869ad519f7c805a4
Implements: blueprint Schema redesign