Refactored DateProvider