Added better dealing with ShouldProcess and ShouldContinue