diff --git a/public/icvar.h b/public/icvar.h
index ba0d5221..9b2d4bae 100644
--- a/public/icvar.h
+++ b/public/icvar.h
@@ -78,7 +78,7 @@ public:
 	virtual ConCommandID FindFirstCommand() = 0;
 	virtual ConCommandID FindNextCommand(ConCommandID previous) = 0;
 
-	virtual void unk02() = 0;
+	virtual void DispatchConCommand(ConCommandID command, CCommandContext& ctx, CCommand& tok) = 0;
 
 	// Install a global change callback (to be called when any convar changes) 
 	virtual void			InstallGlobalChangeCallback(FnChangeCallback_t callback) = 0;
diff --git a/public/tier1/convar.h b/public/tier1/convar.h
index 9efd2255..5d02e857 100644
--- a/public/tier1/convar.h
+++ b/public/tier1/convar.h
@@ -152,15 +152,15 @@ struct ConVarDataType_t
 	const char* name;
 	int data_size;
 	int primitive; // 1 for primitive types, 0 for others
-	void* GetStringValue;
-	void* CopyValue;
-	void* unk1;
+	void* InitValue;
+	void* CloneValue;
+	void* DestroyValue;
 	void* FromString;
 	void* ToString;
 	void* IsEqual;
 	void* Clamp;
 	const char* default_string_value;
-	const char* undefined_string_value;
+	ConVar* undefined_cvar;
 };
 
 struct ConVarDesc_t
diff --git a/public/tier1/iconvar.h b/public/tier1/iconvar.h
index a4091c56..c0d20d7c 100644
--- a/public/tier1/iconvar.h
+++ b/public/tier1/iconvar.h
@@ -28,8 +28,11 @@
 class IConVar;
 class CCommand;
 
-typedef int ConVarID;
-typedef int ConCommandID;
+DECLARE_HANDLE_32BIT(ConVarID);
+#define CONVAR_ID_INVALID ConVarID::MakeHandle( 0xFFFFFFFF )
+
+DECLARE_HANDLE_32BIT(ConCommandID);
+#define CONCOMMAND_ID_INVALID ConCommandID::MakeHandle( 0xFFFFFFFF )
 
 //-----------------------------------------------------------------------------
 // ConVar flags