Begin the refactor of date by context feature
Midle of refactor of date by context feature