improving new DB scheme