Refactor timestamps (now same for all tasks and the envelop file)