Add scope + improve DB dump