Database structure

Change-Id: I7e5e20ab65f6ca0223aaf8a44000ba4b1f0663e5