<pulkit/riya> refactoring continues in date time