Add optional task following