Date, Accessor refactoring