More progress on local dbs