DAO refactoring + end-to-end