Update before refactoring to separate database extraction from analysis