Add namespace and use Db for modification