Refactoring dao date