Rework application workflow/add duration mode