<pulkit/riya> date time refactoring complete