Corrected refactoring in DAO management