Add new control for better handling of long running tasks