Added 'CommandCompletion' functionality.