Added GenericCmdHandler.