Db related changes