agile-tool dao refactoring