Working on the initial database layout