Improved the way we generate dates. Using Chronos properly