Refactored \app\Features\Time