Updated initial DB schema