Refactoring dao project