updated database layout