Updated version of 'CommandCompletion'.