Refactorind default date setter