Update to new DB fetch