Updated Db scheme