diff --git a/include/classinfo/dummy.gen.hpp b/include/classinfo/dummy.gen.hpp
old mode 100755
new mode 100644
index 7142ecb5..d9311d17
--- a/include/classinfo/dummy.gen.hpp
+++ b/include/classinfo/dummy.gen.hpp
@@ -1,540 +1,541 @@
 /*
-	AUTO-GENERATED HEADER - DO NOT MODIFY
-	NON-CONSTEXPR HEADER FOR $mod
+    AUTO-GENERATED HEADER - DO NOT MODIFY
+    NON-CONSTEXPR HEADER FOR $mod
 */
 
 #ifndef DUMMY_AUTOGEN_HPP
 #define DUMMY_AUTOGEN_HPP
 
-namespace client_classes {
-	
-	class dummy {
-	public:
-		int CTETFParticleEffect { 0 };
-		int CTETFExplosion { 0 };
-		int CTETFBlood { 0 };
-		int CTFTankBoss { 0 };
-		int CTFBaseBoss { 0 };
-		int CBossAlpha { 0 };
-		int CZombie { 0 };
-		int CMerasmusDancer { 0 };
-		int CMerasmus { 0 };
-		int CHeadlessHatman { 0 };
-		int CEyeballBoss { 0 };
-		int CTFWeaponSapper { 0 };
-		int CTFWeaponBuilder { 0 };
-		int C_TFWeaponBuilder { 0 };
-		int CTFTeam { 0 };
-		int CTFTauntProp { 0 };
-		int CTFProjectile_Rocket { 0 };
-		int CTFProjectile_Flare { 0 };
-		int CTFProjectile_EnergyBall { 0 };
-		int CTFProjectile_GrapplingHook { 0 };
-		int CTFProjectile_HealingBolt { 0 };
-		int CTFProjectile_Arrow { 0 };
-		int CTFPlayerResource { 0 };
-		int CTFPlayer { 0 };
-		int CTFRagdoll { 0 };
-		int CTEPlayerAnimEvent { 0 };
-		int CTFPasstimeLogic { 0 };
-		int CPasstimeBall { 0 };
-		int CTFObjectiveResource { 0 };
-		int CTFGlow { 0 };
-		int CTEFireBullets { 0 };
-		int CTFBuffBanner { 0 };
-		int CTFAmmoPack { 0 };
-		int CObjectTeleporter { 0 };
-		int CObjectSentrygun { 0 };
-		int CTFProjectile_SentryRocket { 0 };
-		int CObjectSapper { 0 };
-		int CObjectCartDispenser { 0 };
-		int CObjectDispenser { 0 };
-		int CMonsterResource { 0 };
-		int CFuncRespawnRoomVisualizer { 0 };
-		int CFuncRespawnRoom { 0 };
-		int CFuncPasstimeGoal { 0 };
-		int CFuncForceField { 0 };
-		int CCaptureZone { 0 };
-		int CCurrencyPack { 0 };
-		int CBaseObject { 0 };
-		int CTFBotHintEngineerNest { 0 };
-		int CBotNPCMinion { 0 };
-		int CBotNPC { 0 };
-		int CRagdollPropAttached { 0 };
-		int CRagdollProp { 0 };
-		int NextBotCombatCharacter { 0 };
-		int CWaterBullet { 0 };
-		int CFuncMonitor { 0 };
-		int CWorld { 0 };
-		int CWaterLODControl { 0 };
-		int CVGuiScreen { 0 };
-		int CPropJeep { 0 };
-		int CPropVehicleChoreoGeneric { 0 };
-		int CTEWorldDecal { 0 };
-		int CTESpriteSpray { 0 };
-		int CTESprite { 0 };
-		int CTESparks { 0 };
-		int CTESmoke { 0 };
-		int CTEShowLine { 0 };
-		int CTEProjectedDecal { 0 };
-		int CTEPlayerDecal { 0 };
-		int CTEPhysicsProp { 0 };
-		int CTEParticleSystem { 0 };
-		int CTEMuzzleFlash { 0 };
-		int CTELargeFunnel { 0 };
-		int CTEKillPlayerAttachments { 0 };
-		int CTEImpact { 0 };
-		int CTEGlowSprite { 0 };
-		int CTEShatterSurface { 0 };
-		int CTEFootprintDecal { 0 };
-		int CTEFizz { 0 };
-		int CTEExplosion { 0 };
-		int CTEEnergySplash { 0 };
-		int CTEEffectDispatch { 0 };
-		int CTEDynamicLight { 0 };
-		int CTEDecal { 0 };
-		int CTEClientProjectile { 0 };
-		int CTEBubbleTrail { 0 };
-		int CTEBubbles { 0 };
-		int CTEBSPDecal { 0 };
-		int CTEBreakModel { 0 };
-		int CTEBloodStream { 0 };
-		int CTEBloodSprite { 0 };
-		int CTEBeamSpline { 0 };
-		int CTEBeamRingPoint { 0 };
-		int CTEBeamRing { 0 };
-		int CTEBeamPoints { 0 };
-		int CTEBeamLaser { 0 };
-		int CTEBeamFollow { 0 };
-		int CTEBeamEnts { 0 };
-		int CTEBeamEntPoint { 0 };
-		int CTEBaseBeam { 0 };
-		int CTEArmorRicochet { 0 };
-		int CTEMetalSparks { 0 };
-		int CTest_ProxyToggle_Networkable { 0 };
-		int CTestTraceline { 0 };
-		int CTesla { 0 };
-		int CTeamTrainWatcher { 0 };
-		int CBaseTeamObjectiveResource { 0 };
-		int CTeam { 0 };
-		int CSun { 0 };
-		int CSteamJet { 0 };
-		int CParticlePerformanceMonitor { 0 };
-		int CSpotlightEnd { 0 };
-		int DustTrail { 0 };
-		int CFireTrail { 0 };
-		int SporeTrail { 0 };
-		int SporeExplosion { 0 };
-		int RocketTrail { 0 };
-		int SmokeTrail { 0 };
-		int CSmokeStack { 0 };
-		int CSlideshowDisplay { 0 };
-		int CShadowControl { 0 };
-		int CSceneEntity { 0 };
-		int CRopeKeyframe { 0 };
-		int CRagdollManager { 0 };
-		int CPropVehicleDriveable { 0 };
-		int CPhysicsPropMultiplayer { 0 };
-		int CPhysBoxMultiplayer { 0 };
-		int CBasePropDoor { 0 };
-		int CDynamicProp { 0 };
-		int CPointCommentaryNode { 0 };
-		int CPointCamera { 0 };
-		int CPlayerResource { 0 };
-		int CPlasma { 0 };
-		int CPhysMagnet { 0 };
-		int CPhysicsProp { 0 };
-		int CPhysBox { 0 };
-		int CParticleSystem { 0 };
-		int ParticleSmokeGrenade { 0 };
-		int CParticleFire { 0 };
-		int MovieExplosion { 0 };
-		int CMaterialModifyControl { 0 };
-		int CLightGlow { 0 };
-		int CInfoOverlayAccessor { 0 };
-		int CTEGaussExplosion { 0 };
-		int CFuncTrackTrain { 0 };
-		int CFuncSmokeVolume { 0 };
-		int CFuncRotating { 0 };
-		int CFuncReflectiveGlass { 0 };
-		int CFuncOccluder { 0 };
-		int CFunc_LOD { 0 };
-		int CTEDust { 0 };
-		int CFunc_Dust { 0 };
-		int CFuncConveyor { 0 };
-		int CBreakableSurface { 0 };
-		int CFuncAreaPortalWindow { 0 };
-		int CFish { 0 };
-		int CEntityFlame { 0 };
-		int CFireSmoke { 0 };
-		int CEnvTonemapController { 0 };
-		int CEnvScreenEffect { 0 };
-		int CEnvScreenOverlay { 0 };
-		int CEnvProjectedTexture { 0 };
-		int CEnvParticleScript { 0 };
-		int CFogController { 0 };
-		int CEntityParticleTrail { 0 };
-		int CEntityDissolve { 0 };
-		int CEnvQuadraticBeam { 0 };
-		int CEmbers { 0 };
-		int CEnvWind { 0 };
-		int CPrecipitation { 0 };
-		int CDynamicLight { 0 };
-		int CColorCorrectionVolume { 0 };
-		int CColorCorrection { 0 };
-		int CBreakableProp { 0 };
-		int CBaseTempEntity { 0 };
-		int CBasePlayer { 0 };
-		int CBaseFlex { 0 };
-		int CBaseEntity { 0 };
-		int CBaseDoor { 0 };
-		int CBaseCombatCharacter { 0 };
-		int CBaseAnimatingOverlay { 0 };
-		int CBoneFollower { 0 };
-		int CBaseAnimating { 0 };
-		int CInfoLightingRelative { 0 };
-		int CAI_BaseNPC { 0 };
-		int CWeaponIFMSteadyCam { 0 };
-		int CWeaponIFMBaseCamera { 0 };
-		int CWeaponIFMBase { 0 };
-		int CTFWearableLevelableItem { 0 };
-		int CTFWearableDemoShield { 0 };
-		int CTFWearableRobotArm { 0 };
-		int CTFRobotArm { 0 };
-		int CTFWrench { 0 };
-		int CTFProjectile_ThrowableBreadMonster { 0 };
-		int CTFProjectile_ThrowableBrick { 0 };
-		int CTFProjectile_ThrowableRepel { 0 };
-		int CTFProjectile_Throwable { 0 };
-		int CTFThrowable { 0 };
-		int CTFSyringeGun { 0 };
-		int CTFKatana { 0 };
-		int CTFSword { 0 };
-		int CSniperDot { 0 };
-		int CTFSniperRifleClassic { 0 };
-		int CTFSniperRifleDecap { 0 };
-		int CTFSniperRifle { 0 };
-		int CTFChargedSMG { 0 };
-		int CTFSMG { 0 };
-		int CTFShovel { 0 };
-		int CTFShotgunBuildingRescue { 0 };
-		int CTFPEPBrawlerBlaster { 0 };
-		int CTFSodaPopper { 0 };
-		int CTFShotgun_Revenge { 0 };
-		int CTFScatterGun { 0 };
-		int CTFShotgun_Pyro { 0 };
-		int CTFShotgun_HWG { 0 };
-		int CTFShotgun_Soldier { 0 };
-		int CTFShotgun { 0 };
-		int CTFCrossbow { 0 };
-		int CTFRocketLauncher_Mortar { 0 };
-		int CTFRocketLauncher_AirStrike { 0 };
-		int CTFRocketLauncher_DirectHit { 0 };
-		int CTFRocketLauncher { 0 };
-		int CTFRevolver { 0 };
-		int CTFDRGPomson { 0 };
-		int CTFRaygun { 0 };
-		int CTFPistol_ScoutSecondary { 0 };
-		int CTFPistol_ScoutPrimary { 0 };
-		int CTFPistol_Scout { 0 };
-		int CTFPistol { 0 };
-		int CTFPipebombLauncher { 0 };
-		int CTFWeaponPDA_Spy { 0 };
-		int CTFWeaponPDA_Engineer_Destroy { 0 };
-		int CTFWeaponPDA_Engineer_Build { 0 };
-		int CTFWeaponPDAExpansion_Teleporter { 0 };
-		int CTFWeaponPDAExpansion_Dispenser { 0 };
-		int CTFWeaponPDA { 0 };
-		int CPasstimeGun { 0 };
-		int CTFParticleCannon { 0 };
-		int CTFParachute_Secondary { 0 };
-		int CTFParachute_Primary { 0 };
-		int CTFParachute { 0 };
-		int CTFMinigun { 0 };
-		int CTFMedigunShield { 0 };
-		int CWeaponMedigun { 0 };
-		int CTFMechanicalArm { 0 };
-		int CTFLunchBox_Drink { 0 };
-		int CTFLunchBox { 0 };
-		int CLaserDot { 0 };
-		int CTFLaserPointer { 0 };
-		int CTFKnife { 0 };
-		int CTFProjectile_Cleaver { 0 };
-		int CTFProjectile_JarMilk { 0 };
-		int CTFProjectile_Jar { 0 };
-		int CTFCleaver { 0 };
-		int CTFJarMilk { 0 };
-		int CTFJar { 0 };
-		int CTFWeaponInvis { 0 };
-		int CTFGrenadePipebombProjectile { 0 };
-		int CTFCannon { 0 };
-		int CTFGrenadeLauncher { 0 };
-		int CTFGrapplingHook { 0 };
-		int CTFFlareGun_Revenge { 0 };
-		int CTFFlareGun { 0 };
-		int CTFFlameRocket { 0 };
-		int CTFFlameThrower { 0 };
-		int CTFFists { 0 };
-		int CTFFireAxe { 0 };
-		int CTFCompoundBow { 0 };
-		int CTFClub { 0 };
-		int CTFBuffItem { 0 };
-		int CTFStickBomb { 0 };
-		int CTFBottle { 0 };
-		int CTFBonesaw { 0 };
-		int CTFBall_Ornament { 0 };
-		int CTFStunBall { 0 };
-		int CTFBat_Giftwrap { 0 };
-		int CTFBat_Wood { 0 };
-		int CTFBat_Fish { 0 };
-		int CTFBat { 0 };
-		int CTFBaseRocket { 0 };
-		int CTFWeaponBaseMerasmusGrenade { 0 };
-		int CTFWeaponBaseMelee { 0 };
-		int CTFWeaponBaseGun { 0 };
-		int CTFWeaponBaseGrenadeProj { 0 };
-		int CTFWeaponBase { 0 };
-		int CTFViewModel { 0 };
-		int CRobotDispenser { 0 };
-		int CTFRobotDestruction_Robot { 0 };
-		int CTFReviveMarker { 0 };
-		int CTFPumpkinBomb { 0 };
-		int CTFProjectile_EnergyRing { 0 };
-		int CTFBaseProjectile { 0 };
-		int CBaseObjectUpgrade { 0 };
-		int CMannVsMachineStats { 0 };
-		int CTFRobotDestructionLogic { 0 };
-		int CTFRobotDestruction_RobotGroup { 0 };
-		int CTFRobotDestruction_RobotSpawn { 0 };
-		int CTFPlayerDestructionLogic { 0 };
-		int CPlayerDestructionDispenser { 0 };
-		int CTFMinigameLogic { 0 };
-		int CTFHalloweenMinigame_FallingPlatforms { 0 };
-		int CTFHalloweenMinigame { 0 };
-		int CTFMiniGame { 0 };
-		int CTFWearableVM { 0 };
-		int CTFWearable { 0 };
-		int CTFPowerupBottle { 0 };
-		int CTFItem { 0 };
-		int CHalloweenSoulPack { 0 };
-		int CTFGenericBomb { 0 };
-		int CBonusRoundLogic { 0 };
-		int CTFGameRulesProxy { 0 };
-		int CTFDroppedWeapon { 0 };
-		int CTFProjectile_SpellKartBats { 0 };
-		int CTFProjectile_SpellKartOrb { 0 };
-		int CTFHellZap { 0 };
-		int CTFProjectile_SpellLightningOrb { 0 };
-		int CTFProjectile_SpellTransposeTeleport { 0 };
-		int CTFProjectile_SpellMeteorShower { 0 };
-		int CTFProjectile_SpellSpawnBoss { 0 };
-		int CTFProjectile_SpellMirv { 0 };
-		int CTFProjectile_SpellPumpkin { 0 };
-		int CTFProjectile_SpellSpawnHorde { 0 };
-		int CTFProjectile_SpellSpawnZombie { 0 };
-		int CTFProjectile_SpellBats { 0 };
-		int CTFProjectile_SpellFireball { 0 };
-		int CTFSpellBook { 0 };
-		int CHightower_TeleportVortex { 0 };
-		int CTeleportVortex { 0 };
-		int CHalloweenGiftPickup { 0 };
-		int CBonusDuckPickup { 0 };
-		int CHalloweenPickup { 0 };
-		int CCaptureFlagReturnIcon { 0 };
-		int CCaptureFlag { 0 };
-		int CBonusPack { 0 };
-		int CHandleTest { 0 };
-		int CTeamRoundTimer { 0 };
-		int CTeamplayRoundBasedRulesProxy { 0 };
-		int CSpriteTrail { 0 };
-		int CSpriteOriented { 0 };
-		int CSprite { 0 };
-		int CPoseController { 0 };
-		int CGameRulesProxy { 0 };
-		int CInfoLadderDismount { 0 };
-		int CFuncLadder { 0 };
-		int CEnvDetailController { 0 };
-		int CTFWearableItem { 0 };
-		int CEconWearable { 0 };
-		int CBaseAttributableItem { 0 };
-		int CEconEntity { 0 };
-		int CBeam { 0 };
-		int CBaseViewModel { 0 };
-		int CBaseProjectile { 0 };
-		int CBaseParticleEntity { 0 };
-		int CBaseGrenade { 0 };
-		int CBaseCombatWeapon { 0 };
-		int CVoteController { 0 };
-		int CTEHL2MPFireBullets { 0 };
-		int CHL2MPRagdoll { 0 };
-		int CHL2MP_Player { 0 };
-		int CWeaponCitizenSuitcase { 0 };
-		int CWeaponCitizenPackage { 0 };
-		int CWeaponAlyxGun { 0 };
-		int CWeaponCubemap { 0 };
-		int CWeaponGaussGun { 0 };
-		int CWeaponAnnabelle { 0 };
-		int CFlaregun { 0 };
-		int CWeaponBugBait { 0 };
-		int CWeaponBinoculars { 0 };
-		int CWeaponCycler { 0 };
-		int CCrossbowBolt { 0 };
-		int CPropVehiclePrisonerPod { 0 };
-		int CPropCrane { 0 };
-		int CPropCannon { 0 };
-		int CPropAirboat { 0 };
-		int CFlare { 0 };
-		int CTEConcussiveExplosion { 0 };
-		int CNPC_Strider { 0 };
-		int CScriptIntro { 0 };
-		int CRotorWashEmitter { 0 };
-		int CPropCombineBall { 0 };
-		int CPlasmaBeamNode { 0 };
-		int CNPC_RollerMine { 0 };
-		int CNPC_Manhack { 0 };
-		int CNPC_CombineGunship { 0 };
-		int CNPC_AntlionGuard { 0 };
-		int CInfoTeleporterCountdown { 0 };
-		int CMortarShell { 0 };
-		int CEnvStarfield { 0 };
-		int CEnvHeadcrabCanister { 0 };
-		int CAlyxEmpEffect { 0 };
-		int CCorpse { 0 };
-		int CCitadelEnergyCore { 0 };
-		int CHL2_Player { 0 };
-		int CBaseHLBludgeonWeapon { 0 };
-		int CHLSelectFireMachineGun { 0 };
-		int CHLMachineGun { 0 };
-		int CBaseHelicopter { 0 };
-		int CNPC_Barney { 0 };
-		int CNPC_Barnacle { 0 };
-		int AR2Explosion { 0 };
-		int CTEAntlionDust { 0 };
-		int CVortigauntEffectDispel { 0 };
-		int CVortigauntChargeToken { 0 };
-		int CNPC_Vortigaunt { 0 };
-		int CPredictedViewModel { 0 };
-		int CWeaponStunStick { 0 };
-		int CWeaponSMG1 { 0 };
-		int CWeapon_SLAM { 0 };
-		int CWeaponShotgun { 0 };
-		int CWeaponRPG { 0 };
-		int CWeaponPistol { 0 };
-		int CWeaponPhysCannon { 0 };
-		int CHL2MPMachineGun { 0 };
-		int CBaseHL2MPCombatWeapon { 0 };
-		int CBaseHL2MPBludgeonWeapon { 0 };
-		int CWeaponHL2MPBase { 0 };
-		int CWeaponFrag { 0 };
-		int CWeaponCrowbar { 0 };
-		int CWeaponCrossbow { 0 };
-		int CWeaponAR2 { 0 };
-		int CWeapon357 { 0 };
-		int CHL2MPGameRulesProxy { 0 };
-		int CHalfLife2Proxy { 0 };
-		int CBaseHLCombatWeapon { 0 };
-		int CTFVehicle { 0 };
-		int CTFBaseDMPowerup { 0 };
-		int CWeaponSpawner { 0 };
-		int CTFUmbrella { 0 };
-		int CTFTranq { 0 };
-		int CTFSMG_Primary { 0 };
-		int CTFRevolver_Secondary { 0 };
-		int CTFNailgun { 0 };
-		int CTFHunterRifle { 0 };
-		int CTFHeavyArtillery { 0 };
-		int CTFHammerfists { 0 };
-		int CTFCrowbar { 0 };
-		int CTFChainsaw { 0 };
-		int CTEPlantBomb { 0 };
-		int CTERadioIcon { 0 };
-		int CPlantedC4 { 0 };
-		int CCSTeam { 0 };
-		int CCSPlayerResource { 0 };
-		int CCSPlayer { 0 };
-		int CCSRagdoll { 0 };
-		int CHostage { 0 };
-		int CWeaponXM1014 { 0 };
-		int CWeaponUSP { 0 };
-		int CWeaponUMP45 { 0 };
-		int CWeaponTMP { 0 };
-		int CSmokeGrenade { 0 };
-		int CWeaponSG552 { 0 };
-		int CWeaponSG550 { 0 };
-		int CWeaponScout { 0 };
-		int CWeaponP90 { 0 };
-		int CWeaponP228 { 0 };
-		int CWeaponMP5Navy { 0 };
-		int CWeaponMAC10 { 0 };
-		int CWeaponM4A1 { 0 };
-		int CWeaponM3 { 0 };
-		int CWeaponM249 { 0 };
-		int CKnife { 0 };
-		int CHEGrenade { 0 };
-		int CWeaponGlock { 0 };
-		int CWeaponGalil { 0 };
-		int CWeaponG3SG1 { 0 };
-		int CFlashbang { 0 };
-		int CWeaponFiveSeven { 0 };
-		int CWeaponFamas { 0 };
-		int CWeaponElite { 0 };
-		int CDEagle { 0 };
-		int CWeaponCSBaseGun { 0 };
-		int CWeaponCSBase { 0 };
-		int CC4 { 0 };
-		int CBaseCSGrenade { 0 };
-		int CWeaponAWP { 0 };
-		int CWeaponAug { 0 };
-		int CAK47 { 0 };
-		int CFootstepControl { 0 };
-		int CCSGameRulesProxy { 0 };
-		int CBaseCSGrenadeProjectile { 0 };
-		int CSDKTeam_Deathmatch { 0 };
-		int CSDKTeam_Red { 0 };
-		int CSDKTeam_Blue { 0 };
-		int CSDKTeam_Unassigned { 0 };
-		int CSDKTeam { 0 };
-		int CSDKPlayerResource { 0 };
-		int CSDKRagdoll { 0 };
-		int CSDKPlayer { 0 };
-		int CSparkler { 0 };
-		int CRatRaceWaypoint { 0 };
-		int CBriefcaseCaptureZone { 0 };
-		int CBriefcase { 0 };
-		int CWeaponSDKBase { 0 };
-		int CWeaponMP5K { 0 };
-		int CWeaponMossberg { 0 };
-		int CWeaponM1911 { 0 };
-		int CWeaponM16 { 0 };
-		int CWeaponGrenade { 0 };
-		int CWeaponFAL { 0 };
-		int CWeaponBrawl { 0 };
-		int CWeaponBeretta { 0 };
-		int CBaseSDKGrenade { 0 };
-		int CAkimboM1911 { 0 };
-		int CAkimboBeretta { 0 };
-		int CAkimboBase { 0 };
-		int CWeaponSDKMelee { 0 };
-		int CSDKGameRulesProxy { 0 };
-		int CBaseGrenadeProjectile { 0 };
-		int CDAViewModel { 0 };
-		int CTFWearableRazorback { 0 };
-		int CTFWearableCampaignItem { 0 };
-		int CTFSlap { 0 };
-		int CTFRocketPack { 0 };
-		int CTFGasManager { 0 };
-		int CTFProjectile_JarGas { 0 };
-		int CTFJarGas { 0 };
-		int CTFWeaponFlameBall { 0 };
-		int CTFBreakableSign { 0 };
-		int CTFBreakableMelee { 0 };
-		int CTFProjectile_BallOfFire { 0 };
-		int CTFPointManager { 0 };
-		int CTFFlameManager { 0 };
+namespace client_classes
+{
 
-	};
-	
-	extern dummy dummy_list;
+class dummy
+{
+public:
+    int CTETFParticleEffect{ 0 };
+    int CTETFExplosion{ 0 };
+    int CTETFBlood{ 0 };
+    int CTFTankBoss{ 0 };
+    int CTFBaseBoss{ 0 };
+    int CBossAlpha{ 0 };
+    int CZombie{ 0 };
+    int CMerasmusDancer{ 0 };
+    int CMerasmus{ 0 };
+    int CHeadlessHatman{ 0 };
+    int CEyeballBoss{ 0 };
+    int CTFWeaponSapper{ 0 };
+    int CTFWeaponBuilder{ 0 };
+    int C_TFWeaponBuilder{ 0 };
+    int CTFTeam{ 0 };
+    int CTFTauntProp{ 0 };
+    int CTFProjectile_Rocket{ 0 };
+    int CTFProjectile_Flare{ 0 };
+    int CTFProjectile_EnergyBall{ 0 };
+    int CTFProjectile_GrapplingHook{ 0 };
+    int CTFProjectile_HealingBolt{ 0 };
+    int CTFProjectile_Arrow{ 0 };
+    int CTFPlayerResource{ 0 };
+    int CTFPlayer{ 0 };
+    int CTFRagdoll{ 0 };
+    int CTEPlayerAnimEvent{ 0 };
+    int CTFPasstimeLogic{ 0 };
+    int CPasstimeBall{ 0 };
+    int CTFObjectiveResource{ 0 };
+    int CTFGlow{ 0 };
+    int CTEFireBullets{ 0 };
+    int CTFBuffBanner{ 0 };
+    int CTFAmmoPack{ 0 };
+    int CObjectTeleporter{ 0 };
+    int CObjectSentrygun{ 0 };
+    int CTFProjectile_SentryRocket{ 0 };
+    int CObjectSapper{ 0 };
+    int CObjectCartDispenser{ 0 };
+    int CObjectDispenser{ 0 };
+    int CMonsterResource{ 0 };
+    int CFuncRespawnRoomVisualizer{ 0 };
+    int CFuncRespawnRoom{ 0 };
+    int CFuncPasstimeGoal{ 0 };
+    int CFuncForceField{ 0 };
+    int CCaptureZone{ 0 };
+    int CCurrencyPack{ 0 };
+    int CBaseObject{ 0 };
+    int CTFBotHintEngineerNest{ 0 };
+    int CBotNPCMinion{ 0 };
+    int CBotNPC{ 0 };
+    int CRagdollPropAttached{ 0 };
+    int CRagdollProp{ 0 };
+    int NextBotCombatCharacter{ 0 };
+    int CWaterBullet{ 0 };
+    int CFuncMonitor{ 0 };
+    int CWorld{ 0 };
+    int CWaterLODControl{ 0 };
+    int CVGuiScreen{ 0 };
+    int CPropJeep{ 0 };
+    int CPropVehicleChoreoGeneric{ 0 };
+    int CTEWorldDecal{ 0 };
+    int CTESpriteSpray{ 0 };
+    int CTESprite{ 0 };
+    int CTESparks{ 0 };
+    int CTESmoke{ 0 };
+    int CTEShowLine{ 0 };
+    int CTEProjectedDecal{ 0 };
+    int CTEPlayerDecal{ 0 };
+    int CTEPhysicsProp{ 0 };
+    int CTEParticleSystem{ 0 };
+    int CTEMuzzleFlash{ 0 };
+    int CTELargeFunnel{ 0 };
+    int CTEKillPlayerAttachments{ 0 };
+    int CTEImpact{ 0 };
+    int CTEGlowSprite{ 0 };
+    int CTEShatterSurface{ 0 };
+    int CTEFootprintDecal{ 0 };
+    int CTEFizz{ 0 };
+    int CTEExplosion{ 0 };
+    int CTEEnergySplash{ 0 };
+    int CTEEffectDispatch{ 0 };
+    int CTEDynamicLight{ 0 };
+    int CTEDecal{ 0 };
+    int CTEClientProjectile{ 0 };
+    int CTEBubbleTrail{ 0 };
+    int CTEBubbles{ 0 };
+    int CTEBSPDecal{ 0 };
+    int CTEBreakModel{ 0 };
+    int CTEBloodStream{ 0 };
+    int CTEBloodSprite{ 0 };
+    int CTEBeamSpline{ 0 };
+    int CTEBeamRingPoint{ 0 };
+    int CTEBeamRing{ 0 };
+    int CTEBeamPoints{ 0 };
+    int CTEBeamLaser{ 0 };
+    int CTEBeamFollow{ 0 };
+    int CTEBeamEnts{ 0 };
+    int CTEBeamEntPoint{ 0 };
+    int CTEBaseBeam{ 0 };
+    int CTEArmorRicochet{ 0 };
+    int CTEMetalSparks{ 0 };
+    int CTest_ProxyToggle_Networkable{ 0 };
+    int CTestTraceline{ 0 };
+    int CTesla{ 0 };
+    int CTeamTrainWatcher{ 0 };
+    int CBaseTeamObjectiveResource{ 0 };
+    int CTeam{ 0 };
+    int CSun{ 0 };
+    int CSteamJet{ 0 };
+    int CParticlePerformanceMonitor{ 0 };
+    int CSpotlightEnd{ 0 };
+    int DustTrail{ 0 };
+    int CFireTrail{ 0 };
+    int SporeTrail{ 0 };
+    int SporeExplosion{ 0 };
+    int RocketTrail{ 0 };
+    int SmokeTrail{ 0 };
+    int CSmokeStack{ 0 };
+    int CSlideshowDisplay{ 0 };
+    int CShadowControl{ 0 };
+    int CSceneEntity{ 0 };
+    int CRopeKeyframe{ 0 };
+    int CRagdollManager{ 0 };
+    int CPropVehicleDriveable{ 0 };
+    int CPhysicsPropMultiplayer{ 0 };
+    int CPhysBoxMultiplayer{ 0 };
+    int CBasePropDoor{ 0 };
+    int CDynamicProp{ 0 };
+    int CPointCommentaryNode{ 0 };
+    int CPointCamera{ 0 };
+    int CPlayerResource{ 0 };
+    int CPlasma{ 0 };
+    int CPhysMagnet{ 0 };
+    int CPhysicsProp{ 0 };
+    int CPhysBox{ 0 };
+    int CParticleSystem{ 0 };
+    int ParticleSmokeGrenade{ 0 };
+    int CParticleFire{ 0 };
+    int MovieExplosion{ 0 };
+    int CMaterialModifyControl{ 0 };
+    int CLightGlow{ 0 };
+    int CInfoOverlayAccessor{ 0 };
+    int CTEGaussExplosion{ 0 };
+    int CFuncTrackTrain{ 0 };
+    int CFuncSmokeVolume{ 0 };
+    int CFuncRotating{ 0 };
+    int CFuncReflectiveGlass{ 0 };
+    int CFuncOccluder{ 0 };
+    int CFunc_LOD{ 0 };
+    int CTEDust{ 0 };
+    int CFunc_Dust{ 0 };
+    int CFuncConveyor{ 0 };
+    int CBreakableSurface{ 0 };
+    int CFuncAreaPortalWindow{ 0 };
+    int CFish{ 0 };
+    int CEntityFlame{ 0 };
+    int CFireSmoke{ 0 };
+    int CEnvTonemapController{ 0 };
+    int CEnvScreenEffect{ 0 };
+    int CEnvScreenOverlay{ 0 };
+    int CEnvProjectedTexture{ 0 };
+    int CEnvParticleScript{ 0 };
+    int CFogController{ 0 };
+    int CEntityParticleTrail{ 0 };
+    int CEntityDissolve{ 0 };
+    int CEnvQuadraticBeam{ 0 };
+    int CEmbers{ 0 };
+    int CEnvWind{ 0 };
+    int CPrecipitation{ 0 };
+    int CDynamicLight{ 0 };
+    int CColorCorrectionVolume{ 0 };
+    int CColorCorrection{ 0 };
+    int CBreakableProp{ 0 };
+    int CBaseTempEntity{ 0 };
+    int CBasePlayer{ 0 };
+    int CBaseFlex{ 0 };
+    int CBaseEntity{ 0 };
+    int CBaseDoor{ 0 };
+    int CBaseCombatCharacter{ 0 };
+    int CBaseAnimatingOverlay{ 0 };
+    int CBoneFollower{ 0 };
+    int CBaseAnimating{ 0 };
+    int CInfoLightingRelative{ 0 };
+    int CAI_BaseNPC{ 0 };
+    int CWeaponIFMSteadyCam{ 0 };
+    int CWeaponIFMBaseCamera{ 0 };
+    int CWeaponIFMBase{ 0 };
+    int CTFWearableLevelableItem{ 0 };
+    int CTFWearableDemoShield{ 0 };
+    int CTFWearableRobotArm{ 0 };
+    int CTFRobotArm{ 0 };
+    int CTFWrench{ 0 };
+    int CTFProjectile_ThrowableBreadMonster{ 0 };
+    int CTFProjectile_ThrowableBrick{ 0 };
+    int CTFProjectile_ThrowableRepel{ 0 };
+    int CTFProjectile_Throwable{ 0 };
+    int CTFThrowable{ 0 };
+    int CTFSyringeGun{ 0 };
+    int CTFKatana{ 0 };
+    int CTFSword{ 0 };
+    int CSniperDot{ 0 };
+    int CTFSniperRifleClassic{ 0 };
+    int CTFSniperRifleDecap{ 0 };
+    int CTFSniperRifle{ 0 };
+    int CTFChargedSMG{ 0 };
+    int CTFSMG{ 0 };
+    int CTFShovel{ 0 };
+    int CTFShotgunBuildingRescue{ 0 };
+    int CTFPEPBrawlerBlaster{ 0 };
+    int CTFSodaPopper{ 0 };
+    int CTFShotgun_Revenge{ 0 };
+    int CTFScatterGun{ 0 };
+    int CTFShotgun_Pyro{ 0 };
+    int CTFShotgun_HWG{ 0 };
+    int CTFShotgun_Soldier{ 0 };
+    int CTFShotgun{ 0 };
+    int CTFCrossbow{ 0 };
+    int CTFRocketLauncher_Mortar{ 0 };
+    int CTFRocketLauncher_AirStrike{ 0 };
+    int CTFRocketLauncher_DirectHit{ 0 };
+    int CTFRocketLauncher{ 0 };
+    int CTFRevolver{ 0 };
+    int CTFDRGPomson{ 0 };
+    int CTFRaygun{ 0 };
+    int CTFPistol_ScoutSecondary{ 0 };
+    int CTFPistol_ScoutPrimary{ 0 };
+    int CTFPistol_Scout{ 0 };
+    int CTFPistol{ 0 };
+    int CTFPipebombLauncher{ 0 };
+    int CTFWeaponPDA_Spy{ 0 };
+    int CTFWeaponPDA_Engineer_Destroy{ 0 };
+    int CTFWeaponPDA_Engineer_Build{ 0 };
+    int CTFWeaponPDAExpansion_Teleporter{ 0 };
+    int CTFWeaponPDAExpansion_Dispenser{ 0 };
+    int CTFWeaponPDA{ 0 };
+    int CPasstimeGun{ 0 };
+    int CTFParticleCannon{ 0 };
+    int CTFParachute_Secondary{ 0 };
+    int CTFParachute_Primary{ 0 };
+    int CTFParachute{ 0 };
+    int CTFMinigun{ 0 };
+    int CTFMedigunShield{ 0 };
+    int CWeaponMedigun{ 0 };
+    int CTFMechanicalArm{ 0 };
+    int CTFLunchBox_Drink{ 0 };
+    int CTFLunchBox{ 0 };
+    int CLaserDot{ 0 };
+    int CTFLaserPointer{ 0 };
+    int CTFKnife{ 0 };
+    int CTFProjectile_Cleaver{ 0 };
+    int CTFProjectile_JarMilk{ 0 };
+    int CTFProjectile_Jar{ 0 };
+    int CTFCleaver{ 0 };
+    int CTFJarMilk{ 0 };
+    int CTFJar{ 0 };
+    int CTFWeaponInvis{ 0 };
+    int CTFGrenadePipebombProjectile{ 0 };
+    int CTFCannon{ 0 };
+    int CTFGrenadeLauncher{ 0 };
+    int CTFGrapplingHook{ 0 };
+    int CTFFlareGun_Revenge{ 0 };
+    int CTFFlareGun{ 0 };
+    int CTFFlameRocket{ 0 };
+    int CTFFlameThrower{ 0 };
+    int CTFFists{ 0 };
+    int CTFFireAxe{ 0 };
+    int CTFCompoundBow{ 0 };
+    int CTFClub{ 0 };
+    int CTFBuffItem{ 0 };
+    int CTFStickBomb{ 0 };
+    int CTFBottle{ 0 };
+    int CTFBonesaw{ 0 };
+    int CTFBall_Ornament{ 0 };
+    int CTFStunBall{ 0 };
+    int CTFBat_Giftwrap{ 0 };
+    int CTFBat_Wood{ 0 };
+    int CTFBat_Fish{ 0 };
+    int CTFBat{ 0 };
+    int CTFBaseRocket{ 0 };
+    int CTFWeaponBaseMerasmusGrenade{ 0 };
+    int CTFWeaponBaseMelee{ 0 };
+    int CTFWeaponBaseGun{ 0 };
+    int CTFWeaponBaseGrenadeProj{ 0 };
+    int CTFWeaponBase{ 0 };
+    int CTFViewModel{ 0 };
+    int CRobotDispenser{ 0 };
+    int CTFRobotDestruction_Robot{ 0 };
+    int CTFReviveMarker{ 0 };
+    int CTFPumpkinBomb{ 0 };
+    int CTFProjectile_EnergyRing{ 0 };
+    int CTFBaseProjectile{ 0 };
+    int CBaseObjectUpgrade{ 0 };
+    int CMannVsMachineStats{ 0 };
+    int CTFRobotDestructionLogic{ 0 };
+    int CTFRobotDestruction_RobotGroup{ 0 };
+    int CTFRobotDestruction_RobotSpawn{ 0 };
+    int CTFPlayerDestructionLogic{ 0 };
+    int CPlayerDestructionDispenser{ 0 };
+    int CTFMinigameLogic{ 0 };
+    int CTFHalloweenMinigame_FallingPlatforms{ 0 };
+    int CTFHalloweenMinigame{ 0 };
+    int CTFMiniGame{ 0 };
+    int CTFWearableVM{ 0 };
+    int CTFWearable{ 0 };
+    int CTFPowerupBottle{ 0 };
+    int CTFItem{ 0 };
+    int CHalloweenSoulPack{ 0 };
+    int CTFGenericBomb{ 0 };
+    int CBonusRoundLogic{ 0 };
+    int CTFGameRulesProxy{ 0 };
+    int CTFDroppedWeapon{ 0 };
+    int CTFProjectile_SpellKartBats{ 0 };
+    int CTFProjectile_SpellKartOrb{ 0 };
+    int CTFHellZap{ 0 };
+    int CTFProjectile_SpellLightningOrb{ 0 };
+    int CTFProjectile_SpellTransposeTeleport{ 0 };
+    int CTFProjectile_SpellMeteorShower{ 0 };
+    int CTFProjectile_SpellSpawnBoss{ 0 };
+    int CTFProjectile_SpellMirv{ 0 };
+    int CTFProjectile_SpellPumpkin{ 0 };
+    int CTFProjectile_SpellSpawnHorde{ 0 };
+    int CTFProjectile_SpellSpawnZombie{ 0 };
+    int CTFProjectile_SpellBats{ 0 };
+    int CTFProjectile_SpellFireball{ 0 };
+    int CTFSpellBook{ 0 };
+    int CHightower_TeleportVortex{ 0 };
+    int CTeleportVortex{ 0 };
+    int CHalloweenGiftPickup{ 0 };
+    int CBonusDuckPickup{ 0 };
+    int CHalloweenPickup{ 0 };
+    int CCaptureFlagReturnIcon{ 0 };
+    int CCaptureFlag{ 0 };
+    int CBonusPack{ 0 };
+    int CHandleTest{ 0 };
+    int CTeamRoundTimer{ 0 };
+    int CTeamplayRoundBasedRulesProxy{ 0 };
+    int CSpriteTrail{ 0 };
+    int CSpriteOriented{ 0 };
+    int CSprite{ 0 };
+    int CPoseController{ 0 };
+    int CGameRulesProxy{ 0 };
+    int CInfoLadderDismount{ 0 };
+    int CFuncLadder{ 0 };
+    int CEnvDetailController{ 0 };
+    int CTFWearableItem{ 0 };
+    int CEconWearable{ 0 };
+    int CBaseAttributableItem{ 0 };
+    int CEconEntity{ 0 };
+    int CBeam{ 0 };
+    int CBaseViewModel{ 0 };
+    int CBaseProjectile{ 0 };
+    int CBaseParticleEntity{ 0 };
+    int CBaseGrenade{ 0 };
+    int CBaseCombatWeapon{ 0 };
+    int CVoteController{ 0 };
+    int CTEHL2MPFireBullets{ 0 };
+    int CHL2MPRagdoll{ 0 };
+    int CHL2MP_Player{ 0 };
+    int CWeaponCitizenSuitcase{ 0 };
+    int CWeaponCitizenPackage{ 0 };
+    int CWeaponAlyxGun{ 0 };
+    int CWeaponCubemap{ 0 };
+    int CWeaponGaussGun{ 0 };
+    int CWeaponAnnabelle{ 0 };
+    int CFlaregun{ 0 };
+    int CWeaponBugBait{ 0 };
+    int CWeaponBinoculars{ 0 };
+    int CWeaponCycler{ 0 };
+    int CCrossbowBolt{ 0 };
+    int CPropVehiclePrisonerPod{ 0 };
+    int CPropCrane{ 0 };
+    int CPropCannon{ 0 };
+    int CPropAirboat{ 0 };
+    int CFlare{ 0 };
+    int CTEConcussiveExplosion{ 0 };
+    int CNPC_Strider{ 0 };
+    int CScriptIntro{ 0 };
+    int CRotorWashEmitter{ 0 };
+    int CPropCombineBall{ 0 };
+    int CPlasmaBeamNode{ 0 };
+    int CNPC_RollerMine{ 0 };
+    int CNPC_Manhack{ 0 };
+    int CNPC_CombineGunship{ 0 };
+    int CNPC_AntlionGuard{ 0 };
+    int CInfoTeleporterCountdown{ 0 };
+    int CMortarShell{ 0 };
+    int CEnvStarfield{ 0 };
+    int CEnvHeadcrabCanister{ 0 };
+    int CAlyxEmpEffect{ 0 };
+    int CCorpse{ 0 };
+    int CCitadelEnergyCore{ 0 };
+    int CHL2_Player{ 0 };
+    int CBaseHLBludgeonWeapon{ 0 };
+    int CHLSelectFireMachineGun{ 0 };
+    int CHLMachineGun{ 0 };
+    int CBaseHelicopter{ 0 };
+    int CNPC_Barney{ 0 };
+    int CNPC_Barnacle{ 0 };
+    int AR2Explosion{ 0 };
+    int CTEAntlionDust{ 0 };
+    int CVortigauntEffectDispel{ 0 };
+    int CVortigauntChargeToken{ 0 };
+    int CNPC_Vortigaunt{ 0 };
+    int CPredictedViewModel{ 0 };
+    int CWeaponStunStick{ 0 };
+    int CWeaponSMG1{ 0 };
+    int CWeapon_SLAM{ 0 };
+    int CWeaponShotgun{ 0 };
+    int CWeaponRPG{ 0 };
+    int CWeaponPistol{ 0 };
+    int CWeaponPhysCannon{ 0 };
+    int CHL2MPMachineGun{ 0 };
+    int CBaseHL2MPCombatWeapon{ 0 };
+    int CBaseHL2MPBludgeonWeapon{ 0 };
+    int CWeaponHL2MPBase{ 0 };
+    int CWeaponFrag{ 0 };
+    int CWeaponCrowbar{ 0 };
+    int CWeaponCrossbow{ 0 };
+    int CWeaponAR2{ 0 };
+    int CWeapon357{ 0 };
+    int CHL2MPGameRulesProxy{ 0 };
+    int CHalfLife2Proxy{ 0 };
+    int CBaseHLCombatWeapon{ 0 };
+    int CTFVehicle{ 0 };
+    int CTFBaseDMPowerup{ 0 };
+    int CWeaponSpawner{ 0 };
+    int CTFUmbrella{ 0 };
+    int CTFTranq{ 0 };
+    int CTFSMG_Primary{ 0 };
+    int CTFRevolver_Secondary{ 0 };
+    int CTFNailgun{ 0 };
+    int CTFHunterRifle{ 0 };
+    int CTFHeavyArtillery{ 0 };
+    int CTFHammerfists{ 0 };
+    int CTFCrowbar{ 0 };
+    int CTFChainsaw{ 0 };
+    int CTEPlantBomb{ 0 };
+    int CTERadioIcon{ 0 };
+    int CPlantedC4{ 0 };
+    int CCSTeam{ 0 };
+    int CCSPlayerResource{ 0 };
+    int CCSPlayer{ 0 };
+    int CCSRagdoll{ 0 };
+    int CHostage{ 0 };
+    int CWeaponXM1014{ 0 };
+    int CWeaponUSP{ 0 };
+    int CWeaponUMP45{ 0 };
+    int CWeaponTMP{ 0 };
+    int CSmokeGrenade{ 0 };
+    int CWeaponSG552{ 0 };
+    int CWeaponSG550{ 0 };
+    int CWeaponScout{ 0 };
+    int CWeaponP90{ 0 };
+    int CWeaponP228{ 0 };
+    int CWeaponMP5Navy{ 0 };
+    int CWeaponMAC10{ 0 };
+    int CWeaponM4A1{ 0 };
+    int CWeaponM3{ 0 };
+    int CWeaponM249{ 0 };
+    int CKnife{ 0 };
+    int CHEGrenade{ 0 };
+    int CWeaponGlock{ 0 };
+    int CWeaponGalil{ 0 };
+    int CWeaponG3SG1{ 0 };
+    int CFlashbang{ 0 };
+    int CWeaponFiveSeven{ 0 };
+    int CWeaponFamas{ 0 };
+    int CWeaponElite{ 0 };
+    int CDEagle{ 0 };
+    int CWeaponCSBaseGun{ 0 };
+    int CWeaponCSBase{ 0 };
+    int CC4{ 0 };
+    int CBaseCSGrenade{ 0 };
+    int CWeaponAWP{ 0 };
+    int CWeaponAug{ 0 };
+    int CAK47{ 0 };
+    int CFootstepControl{ 0 };
+    int CCSGameRulesProxy{ 0 };
+    int CBaseCSGrenadeProjectile{ 0 };
+    int CSDKTeam_Deathmatch{ 0 };
+    int CSDKTeam_Red{ 0 };
+    int CSDKTeam_Blue{ 0 };
+    int CSDKTeam_Unassigned{ 0 };
+    int CSDKTeam{ 0 };
+    int CSDKPlayerResource{ 0 };
+    int CSDKRagdoll{ 0 };
+    int CSDKPlayer{ 0 };
+    int CSparkler{ 0 };
+    int CRatRaceWaypoint{ 0 };
+    int CBriefcaseCaptureZone{ 0 };
+    int CBriefcase{ 0 };
+    int CWeaponSDKBase{ 0 };
+    int CWeaponMP5K{ 0 };
+    int CWeaponMossberg{ 0 };
+    int CWeaponM1911{ 0 };
+    int CWeaponM16{ 0 };
+    int CWeaponGrenade{ 0 };
+    int CWeaponFAL{ 0 };
+    int CWeaponBrawl{ 0 };
+    int CWeaponBeretta{ 0 };
+    int CBaseSDKGrenade{ 0 };
+    int CAkimboM1911{ 0 };
+    int CAkimboBeretta{ 0 };
+    int CAkimboBase{ 0 };
+    int CWeaponSDKMelee{ 0 };
+    int CSDKGameRulesProxy{ 0 };
+    int CBaseGrenadeProjectile{ 0 };
+    int CDAViewModel{ 0 };
+    int CTFWearableRazorback{ 0 };
+    int CTFWearableCampaignItem{ 0 };
+    int CTFSlap{ 0 };
+    int CTFRocketPack{ 0 };
+    int CTFGasManager{ 0 };
+    int CTFProjectile_JarGas{ 0 };
+    int CTFJarGas{ 0 };
+    int CTFWeaponFlameBall{ 0 };
+    int CTFBreakableSign{ 0 };
+    int CTFBreakableMelee{ 0 };
+    int CTFProjectile_BallOfFire{ 0 };
+    int CTFPointManager{ 0 };
+    int CTFFlameManager{ 0 };
+};
+
+extern dummy dummy_list;
 }
 
 #endif /* DUMMY_AUTOGEN_HPP */
\ No newline at end of file
diff --git a/include/classinfo/dynamic.gen.hpp b/include/classinfo/dynamic.gen.hpp
old mode 100755
new mode 100644
index 23b4bf73..38cc62b6
--- a/include/classinfo/dynamic.gen.hpp
+++ b/include/classinfo/dynamic.gen.hpp
@@ -1,542 +1,543 @@
 /*
-	AUTO-GENERATED HEADER - DO NOT MODIFY
-	HEADER FOR UNIVERSAL BUILD
+    AUTO-GENERATED HEADER - DO NOT MODIFY
+    HEADER FOR UNIVERSAL BUILD
 */
 
 #ifndef DYNAMIC_AUTOGEN_HPP
 #define DYNAMIC_AUTOGEN_HPP
 
-namespace client_classes {
-	
-	class dynamic {
-	public:
-		dynamic();
-		void Populate();
-		int CTETFParticleEffect { 0 };
-		int CTETFExplosion { 0 };
-		int CTETFBlood { 0 };
-		int CTFTankBoss { 0 };
-		int CTFBaseBoss { 0 };
-		int CBossAlpha { 0 };
-		int CZombie { 0 };
-		int CMerasmusDancer { 0 };
-		int CMerasmus { 0 };
-		int CHeadlessHatman { 0 };
-		int CEyeballBoss { 0 };
-		int CTFWeaponSapper { 0 };
-		int CTFWeaponBuilder { 0 };
-		int C_TFWeaponBuilder { 0 };
-		int CTFTeam { 0 };
-		int CTFTauntProp { 0 };
-		int CTFProjectile_Rocket { 0 };
-		int CTFProjectile_Flare { 0 };
-		int CTFProjectile_EnergyBall { 0 };
-		int CTFProjectile_GrapplingHook { 0 };
-		int CTFProjectile_HealingBolt { 0 };
-		int CTFProjectile_Arrow { 0 };
-		int CTFPlayerResource { 0 };
-		int CTFPlayer { 0 };
-		int CTFRagdoll { 0 };
-		int CTEPlayerAnimEvent { 0 };
-		int CTFPasstimeLogic { 0 };
-		int CPasstimeBall { 0 };
-		int CTFObjectiveResource { 0 };
-		int CTFGlow { 0 };
-		int CTEFireBullets { 0 };
-		int CTFBuffBanner { 0 };
-		int CTFAmmoPack { 0 };
-		int CObjectTeleporter { 0 };
-		int CObjectSentrygun { 0 };
-		int CTFProjectile_SentryRocket { 0 };
-		int CObjectSapper { 0 };
-		int CObjectCartDispenser { 0 };
-		int CObjectDispenser { 0 };
-		int CMonsterResource { 0 };
-		int CFuncRespawnRoomVisualizer { 0 };
-		int CFuncRespawnRoom { 0 };
-		int CFuncPasstimeGoal { 0 };
-		int CFuncForceField { 0 };
-		int CCaptureZone { 0 };
-		int CCurrencyPack { 0 };
-		int CBaseObject { 0 };
-		int CTFBotHintEngineerNest { 0 };
-		int CBotNPCMinion { 0 };
-		int CBotNPC { 0 };
-		int CRagdollPropAttached { 0 };
-		int CRagdollProp { 0 };
-		int NextBotCombatCharacter { 0 };
-		int CWaterBullet { 0 };
-		int CFuncMonitor { 0 };
-		int CWorld { 0 };
-		int CWaterLODControl { 0 };
-		int CVGuiScreen { 0 };
-		int CPropJeep { 0 };
-		int CPropVehicleChoreoGeneric { 0 };
-		int CTEWorldDecal { 0 };
-		int CTESpriteSpray { 0 };
-		int CTESprite { 0 };
-		int CTESparks { 0 };
-		int CTESmoke { 0 };
-		int CTEShowLine { 0 };
-		int CTEProjectedDecal { 0 };
-		int CTEPlayerDecal { 0 };
-		int CTEPhysicsProp { 0 };
-		int CTEParticleSystem { 0 };
-		int CTEMuzzleFlash { 0 };
-		int CTELargeFunnel { 0 };
-		int CTEKillPlayerAttachments { 0 };
-		int CTEImpact { 0 };
-		int CTEGlowSprite { 0 };
-		int CTEShatterSurface { 0 };
-		int CTEFootprintDecal { 0 };
-		int CTEFizz { 0 };
-		int CTEExplosion { 0 };
-		int CTEEnergySplash { 0 };
-		int CTEEffectDispatch { 0 };
-		int CTEDynamicLight { 0 };
-		int CTEDecal { 0 };
-		int CTEClientProjectile { 0 };
-		int CTEBubbleTrail { 0 };
-		int CTEBubbles { 0 };
-		int CTEBSPDecal { 0 };
-		int CTEBreakModel { 0 };
-		int CTEBloodStream { 0 };
-		int CTEBloodSprite { 0 };
-		int CTEBeamSpline { 0 };
-		int CTEBeamRingPoint { 0 };
-		int CTEBeamRing { 0 };
-		int CTEBeamPoints { 0 };
-		int CTEBeamLaser { 0 };
-		int CTEBeamFollow { 0 };
-		int CTEBeamEnts { 0 };
-		int CTEBeamEntPoint { 0 };
-		int CTEBaseBeam { 0 };
-		int CTEArmorRicochet { 0 };
-		int CTEMetalSparks { 0 };
-		int CTest_ProxyToggle_Networkable { 0 };
-		int CTestTraceline { 0 };
-		int CTesla { 0 };
-		int CTeamTrainWatcher { 0 };
-		int CBaseTeamObjectiveResource { 0 };
-		int CTeam { 0 };
-		int CSun { 0 };
-		int CSteamJet { 0 };
-		int CParticlePerformanceMonitor { 0 };
-		int CSpotlightEnd { 0 };
-		int DustTrail { 0 };
-		int CFireTrail { 0 };
-		int SporeTrail { 0 };
-		int SporeExplosion { 0 };
-		int RocketTrail { 0 };
-		int SmokeTrail { 0 };
-		int CSmokeStack { 0 };
-		int CSlideshowDisplay { 0 };
-		int CShadowControl { 0 };
-		int CSceneEntity { 0 };
-		int CRopeKeyframe { 0 };
-		int CRagdollManager { 0 };
-		int CPropVehicleDriveable { 0 };
-		int CPhysicsPropMultiplayer { 0 };
-		int CPhysBoxMultiplayer { 0 };
-		int CBasePropDoor { 0 };
-		int CDynamicProp { 0 };
-		int CPointCommentaryNode { 0 };
-		int CPointCamera { 0 };
-		int CPlayerResource { 0 };
-		int CPlasma { 0 };
-		int CPhysMagnet { 0 };
-		int CPhysicsProp { 0 };
-		int CPhysBox { 0 };
-		int CParticleSystem { 0 };
-		int ParticleSmokeGrenade { 0 };
-		int CParticleFire { 0 };
-		int MovieExplosion { 0 };
-		int CMaterialModifyControl { 0 };
-		int CLightGlow { 0 };
-		int CInfoOverlayAccessor { 0 };
-		int CTEGaussExplosion { 0 };
-		int CFuncTrackTrain { 0 };
-		int CFuncSmokeVolume { 0 };
-		int CFuncRotating { 0 };
-		int CFuncReflectiveGlass { 0 };
-		int CFuncOccluder { 0 };
-		int CFunc_LOD { 0 };
-		int CTEDust { 0 };
-		int CFunc_Dust { 0 };
-		int CFuncConveyor { 0 };
-		int CBreakableSurface { 0 };
-		int CFuncAreaPortalWindow { 0 };
-		int CFish { 0 };
-		int CEntityFlame { 0 };
-		int CFireSmoke { 0 };
-		int CEnvTonemapController { 0 };
-		int CEnvScreenEffect { 0 };
-		int CEnvScreenOverlay { 0 };
-		int CEnvProjectedTexture { 0 };
-		int CEnvParticleScript { 0 };
-		int CFogController { 0 };
-		int CEntityParticleTrail { 0 };
-		int CEntityDissolve { 0 };
-		int CEnvQuadraticBeam { 0 };
-		int CEmbers { 0 };
-		int CEnvWind { 0 };
-		int CPrecipitation { 0 };
-		int CDynamicLight { 0 };
-		int CColorCorrectionVolume { 0 };
-		int CColorCorrection { 0 };
-		int CBreakableProp { 0 };
-		int CBaseTempEntity { 0 };
-		int CBasePlayer { 0 };
-		int CBaseFlex { 0 };
-		int CBaseEntity { 0 };
-		int CBaseDoor { 0 };
-		int CBaseCombatCharacter { 0 };
-		int CBaseAnimatingOverlay { 0 };
-		int CBoneFollower { 0 };
-		int CBaseAnimating { 0 };
-		int CInfoLightingRelative { 0 };
-		int CAI_BaseNPC { 0 };
-		int CWeaponIFMSteadyCam { 0 };
-		int CWeaponIFMBaseCamera { 0 };
-		int CWeaponIFMBase { 0 };
-		int CTFWearableLevelableItem { 0 };
-		int CTFWearableDemoShield { 0 };
-		int CTFWearableRobotArm { 0 };
-		int CTFRobotArm { 0 };
-		int CTFWrench { 0 };
-		int CTFProjectile_ThrowableBreadMonster { 0 };
-		int CTFProjectile_ThrowableBrick { 0 };
-		int CTFProjectile_ThrowableRepel { 0 };
-		int CTFProjectile_Throwable { 0 };
-		int CTFThrowable { 0 };
-		int CTFSyringeGun { 0 };
-		int CTFKatana { 0 };
-		int CTFSword { 0 };
-		int CSniperDot { 0 };
-		int CTFSniperRifleClassic { 0 };
-		int CTFSniperRifleDecap { 0 };
-		int CTFSniperRifle { 0 };
-		int CTFChargedSMG { 0 };
-		int CTFSMG { 0 };
-		int CTFShovel { 0 };
-		int CTFShotgunBuildingRescue { 0 };
-		int CTFPEPBrawlerBlaster { 0 };
-		int CTFSodaPopper { 0 };
-		int CTFShotgun_Revenge { 0 };
-		int CTFScatterGun { 0 };
-		int CTFShotgun_Pyro { 0 };
-		int CTFShotgun_HWG { 0 };
-		int CTFShotgun_Soldier { 0 };
-		int CTFShotgun { 0 };
-		int CTFCrossbow { 0 };
-		int CTFRocketLauncher_Mortar { 0 };
-		int CTFRocketLauncher_AirStrike { 0 };
-		int CTFRocketLauncher_DirectHit { 0 };
-		int CTFRocketLauncher { 0 };
-		int CTFRevolver { 0 };
-		int CTFDRGPomson { 0 };
-		int CTFRaygun { 0 };
-		int CTFPistol_ScoutSecondary { 0 };
-		int CTFPistol_ScoutPrimary { 0 };
-		int CTFPistol_Scout { 0 };
-		int CTFPistol { 0 };
-		int CTFPipebombLauncher { 0 };
-		int CTFWeaponPDA_Spy { 0 };
-		int CTFWeaponPDA_Engineer_Destroy { 0 };
-		int CTFWeaponPDA_Engineer_Build { 0 };
-		int CTFWeaponPDAExpansion_Teleporter { 0 };
-		int CTFWeaponPDAExpansion_Dispenser { 0 };
-		int CTFWeaponPDA { 0 };
-		int CPasstimeGun { 0 };
-		int CTFParticleCannon { 0 };
-		int CTFParachute_Secondary { 0 };
-		int CTFParachute_Primary { 0 };
-		int CTFParachute { 0 };
-		int CTFMinigun { 0 };
-		int CTFMedigunShield { 0 };
-		int CWeaponMedigun { 0 };
-		int CTFMechanicalArm { 0 };
-		int CTFLunchBox_Drink { 0 };
-		int CTFLunchBox { 0 };
-		int CLaserDot { 0 };
-		int CTFLaserPointer { 0 };
-		int CTFKnife { 0 };
-		int CTFProjectile_Cleaver { 0 };
-		int CTFProjectile_JarMilk { 0 };
-		int CTFProjectile_Jar { 0 };
-		int CTFCleaver { 0 };
-		int CTFJarMilk { 0 };
-		int CTFJar { 0 };
-		int CTFWeaponInvis { 0 };
-		int CTFGrenadePipebombProjectile { 0 };
-		int CTFCannon { 0 };
-		int CTFGrenadeLauncher { 0 };
-		int CTFGrapplingHook { 0 };
-		int CTFFlareGun_Revenge { 0 };
-		int CTFFlareGun { 0 };
-		int CTFFlameRocket { 0 };
-		int CTFFlameThrower { 0 };
-		int CTFFists { 0 };
-		int CTFFireAxe { 0 };
-		int CTFCompoundBow { 0 };
-		int CTFClub { 0 };
-		int CTFBuffItem { 0 };
-		int CTFStickBomb { 0 };
-		int CTFBottle { 0 };
-		int CTFBonesaw { 0 };
-		int CTFBall_Ornament { 0 };
-		int CTFStunBall { 0 };
-		int CTFBat_Giftwrap { 0 };
-		int CTFBat_Wood { 0 };
-		int CTFBat_Fish { 0 };
-		int CTFBat { 0 };
-		int CTFBaseRocket { 0 };
-		int CTFWeaponBaseMerasmusGrenade { 0 };
-		int CTFWeaponBaseMelee { 0 };
-		int CTFWeaponBaseGun { 0 };
-		int CTFWeaponBaseGrenadeProj { 0 };
-		int CTFWeaponBase { 0 };
-		int CTFViewModel { 0 };
-		int CRobotDispenser { 0 };
-		int CTFRobotDestruction_Robot { 0 };
-		int CTFReviveMarker { 0 };
-		int CTFPumpkinBomb { 0 };
-		int CTFProjectile_EnergyRing { 0 };
-		int CTFBaseProjectile { 0 };
-		int CBaseObjectUpgrade { 0 };
-		int CMannVsMachineStats { 0 };
-		int CTFRobotDestructionLogic { 0 };
-		int CTFRobotDestruction_RobotGroup { 0 };
-		int CTFRobotDestruction_RobotSpawn { 0 };
-		int CTFPlayerDestructionLogic { 0 };
-		int CPlayerDestructionDispenser { 0 };
-		int CTFMinigameLogic { 0 };
-		int CTFHalloweenMinigame_FallingPlatforms { 0 };
-		int CTFHalloweenMinigame { 0 };
-		int CTFMiniGame { 0 };
-		int CTFWearableVM { 0 };
-		int CTFWearable { 0 };
-		int CTFPowerupBottle { 0 };
-		int CTFItem { 0 };
-		int CHalloweenSoulPack { 0 };
-		int CTFGenericBomb { 0 };
-		int CBonusRoundLogic { 0 };
-		int CTFGameRulesProxy { 0 };
-		int CTFDroppedWeapon { 0 };
-		int CTFProjectile_SpellKartBats { 0 };
-		int CTFProjectile_SpellKartOrb { 0 };
-		int CTFHellZap { 0 };
-		int CTFProjectile_SpellLightningOrb { 0 };
-		int CTFProjectile_SpellTransposeTeleport { 0 };
-		int CTFProjectile_SpellMeteorShower { 0 };
-		int CTFProjectile_SpellSpawnBoss { 0 };
-		int CTFProjectile_SpellMirv { 0 };
-		int CTFProjectile_SpellPumpkin { 0 };
-		int CTFProjectile_SpellSpawnHorde { 0 };
-		int CTFProjectile_SpellSpawnZombie { 0 };
-		int CTFProjectile_SpellBats { 0 };
-		int CTFProjectile_SpellFireball { 0 };
-		int CTFSpellBook { 0 };
-		int CHightower_TeleportVortex { 0 };
-		int CTeleportVortex { 0 };
-		int CHalloweenGiftPickup { 0 };
-		int CBonusDuckPickup { 0 };
-		int CHalloweenPickup { 0 };
-		int CCaptureFlagReturnIcon { 0 };
-		int CCaptureFlag { 0 };
-		int CBonusPack { 0 };
-		int CHandleTest { 0 };
-		int CTeamRoundTimer { 0 };
-		int CTeamplayRoundBasedRulesProxy { 0 };
-		int CSpriteTrail { 0 };
-		int CSpriteOriented { 0 };
-		int CSprite { 0 };
-		int CPoseController { 0 };
-		int CGameRulesProxy { 0 };
-		int CInfoLadderDismount { 0 };
-		int CFuncLadder { 0 };
-		int CEnvDetailController { 0 };
-		int CTFWearableItem { 0 };
-		int CEconWearable { 0 };
-		int CBaseAttributableItem { 0 };
-		int CEconEntity { 0 };
-		int CBeam { 0 };
-		int CBaseViewModel { 0 };
-		int CBaseProjectile { 0 };
-		int CBaseParticleEntity { 0 };
-		int CBaseGrenade { 0 };
-		int CBaseCombatWeapon { 0 };
-		int CVoteController { 0 };
-		int CTEHL2MPFireBullets { 0 };
-		int CHL2MPRagdoll { 0 };
-		int CHL2MP_Player { 0 };
-		int CWeaponCitizenSuitcase { 0 };
-		int CWeaponCitizenPackage { 0 };
-		int CWeaponAlyxGun { 0 };
-		int CWeaponCubemap { 0 };
-		int CWeaponGaussGun { 0 };
-		int CWeaponAnnabelle { 0 };
-		int CFlaregun { 0 };
-		int CWeaponBugBait { 0 };
-		int CWeaponBinoculars { 0 };
-		int CWeaponCycler { 0 };
-		int CCrossbowBolt { 0 };
-		int CPropVehiclePrisonerPod { 0 };
-		int CPropCrane { 0 };
-		int CPropCannon { 0 };
-		int CPropAirboat { 0 };
-		int CFlare { 0 };
-		int CTEConcussiveExplosion { 0 };
-		int CNPC_Strider { 0 };
-		int CScriptIntro { 0 };
-		int CRotorWashEmitter { 0 };
-		int CPropCombineBall { 0 };
-		int CPlasmaBeamNode { 0 };
-		int CNPC_RollerMine { 0 };
-		int CNPC_Manhack { 0 };
-		int CNPC_CombineGunship { 0 };
-		int CNPC_AntlionGuard { 0 };
-		int CInfoTeleporterCountdown { 0 };
-		int CMortarShell { 0 };
-		int CEnvStarfield { 0 };
-		int CEnvHeadcrabCanister { 0 };
-		int CAlyxEmpEffect { 0 };
-		int CCorpse { 0 };
-		int CCitadelEnergyCore { 0 };
-		int CHL2_Player { 0 };
-		int CBaseHLBludgeonWeapon { 0 };
-		int CHLSelectFireMachineGun { 0 };
-		int CHLMachineGun { 0 };
-		int CBaseHelicopter { 0 };
-		int CNPC_Barney { 0 };
-		int CNPC_Barnacle { 0 };
-		int AR2Explosion { 0 };
-		int CTEAntlionDust { 0 };
-		int CVortigauntEffectDispel { 0 };
-		int CVortigauntChargeToken { 0 };
-		int CNPC_Vortigaunt { 0 };
-		int CPredictedViewModel { 0 };
-		int CWeaponStunStick { 0 };
-		int CWeaponSMG1 { 0 };
-		int CWeapon_SLAM { 0 };
-		int CWeaponShotgun { 0 };
-		int CWeaponRPG { 0 };
-		int CWeaponPistol { 0 };
-		int CWeaponPhysCannon { 0 };
-		int CHL2MPMachineGun { 0 };
-		int CBaseHL2MPCombatWeapon { 0 };
-		int CBaseHL2MPBludgeonWeapon { 0 };
-		int CWeaponHL2MPBase { 0 };
-		int CWeaponFrag { 0 };
-		int CWeaponCrowbar { 0 };
-		int CWeaponCrossbow { 0 };
-		int CWeaponAR2 { 0 };
-		int CWeapon357 { 0 };
-		int CHL2MPGameRulesProxy { 0 };
-		int CHalfLife2Proxy { 0 };
-		int CBaseHLCombatWeapon { 0 };
-		int CTFVehicle { 0 };
-		int CTFBaseDMPowerup { 0 };
-		int CWeaponSpawner { 0 };
-		int CTFUmbrella { 0 };
-		int CTFTranq { 0 };
-		int CTFSMG_Primary { 0 };
-		int CTFRevolver_Secondary { 0 };
-		int CTFNailgun { 0 };
-		int CTFHunterRifle { 0 };
-		int CTFHeavyArtillery { 0 };
-		int CTFHammerfists { 0 };
-		int CTFCrowbar { 0 };
-		int CTFChainsaw { 0 };
-		int CTEPlantBomb { 0 };
-		int CTERadioIcon { 0 };
-		int CPlantedC4 { 0 };
-		int CCSTeam { 0 };
-		int CCSPlayerResource { 0 };
-		int CCSPlayer { 0 };
-		int CCSRagdoll { 0 };
-		int CHostage { 0 };
-		int CWeaponXM1014 { 0 };
-		int CWeaponUSP { 0 };
-		int CWeaponUMP45 { 0 };
-		int CWeaponTMP { 0 };
-		int CSmokeGrenade { 0 };
-		int CWeaponSG552 { 0 };
-		int CWeaponSG550 { 0 };
-		int CWeaponScout { 0 };
-		int CWeaponP90 { 0 };
-		int CWeaponP228 { 0 };
-		int CWeaponMP5Navy { 0 };
-		int CWeaponMAC10 { 0 };
-		int CWeaponM4A1 { 0 };
-		int CWeaponM3 { 0 };
-		int CWeaponM249 { 0 };
-		int CKnife { 0 };
-		int CHEGrenade { 0 };
-		int CWeaponGlock { 0 };
-		int CWeaponGalil { 0 };
-		int CWeaponG3SG1 { 0 };
-		int CFlashbang { 0 };
-		int CWeaponFiveSeven { 0 };
-		int CWeaponFamas { 0 };
-		int CWeaponElite { 0 };
-		int CDEagle { 0 };
-		int CWeaponCSBaseGun { 0 };
-		int CWeaponCSBase { 0 };
-		int CC4 { 0 };
-		int CBaseCSGrenade { 0 };
-		int CWeaponAWP { 0 };
-		int CWeaponAug { 0 };
-		int CAK47 { 0 };
-		int CFootstepControl { 0 };
-		int CCSGameRulesProxy { 0 };
-		int CBaseCSGrenadeProjectile { 0 };
-		int CSDKTeam_Deathmatch { 0 };
-		int CSDKTeam_Red { 0 };
-		int CSDKTeam_Blue { 0 };
-		int CSDKTeam_Unassigned { 0 };
-		int CSDKTeam { 0 };
-		int CSDKPlayerResource { 0 };
-		int CSDKRagdoll { 0 };
-		int CSDKPlayer { 0 };
-		int CSparkler { 0 };
-		int CRatRaceWaypoint { 0 };
-		int CBriefcaseCaptureZone { 0 };
-		int CBriefcase { 0 };
-		int CWeaponSDKBase { 0 };
-		int CWeaponMP5K { 0 };
-		int CWeaponMossberg { 0 };
-		int CWeaponM1911 { 0 };
-		int CWeaponM16 { 0 };
-		int CWeaponGrenade { 0 };
-		int CWeaponFAL { 0 };
-		int CWeaponBrawl { 0 };
-		int CWeaponBeretta { 0 };
-		int CBaseSDKGrenade { 0 };
-		int CAkimboM1911 { 0 };
-		int CAkimboBeretta { 0 };
-		int CAkimboBase { 0 };
-		int CWeaponSDKMelee { 0 };
-		int CSDKGameRulesProxy { 0 };
-		int CBaseGrenadeProjectile { 0 };
-		int CDAViewModel { 0 };
-		int CTFWearableRazorback { 0 };
-		int CTFWearableCampaignItem { 0 };
-		int CTFSlap { 0 };
-		int CTFRocketPack { 0 };
-		int CTFGasManager { 0 };
-		int CTFProjectile_JarGas { 0 };
-		int CTFJarGas { 0 };
-		int CTFWeaponFlameBall { 0 };
-		int CTFBreakableSign { 0 };
-		int CTFBreakableMelee { 0 };
-		int CTFProjectile_BallOfFire { 0 };
-		int CTFPointManager { 0 };
-		int CTFFlameManager { 0 };
+namespace client_classes
+{
 
-	};
-	
-	extern dynamic dynamic_list;
+class dynamic
+{
+public:
+    dynamic();
+    void Populate();
+    int CTETFParticleEffect{ 0 };
+    int CTETFExplosion{ 0 };
+    int CTETFBlood{ 0 };
+    int CTFTankBoss{ 0 };
+    int CTFBaseBoss{ 0 };
+    int CBossAlpha{ 0 };
+    int CZombie{ 0 };
+    int CMerasmusDancer{ 0 };
+    int CMerasmus{ 0 };
+    int CHeadlessHatman{ 0 };
+    int CEyeballBoss{ 0 };
+    int CTFWeaponSapper{ 0 };
+    int CTFWeaponBuilder{ 0 };
+    int C_TFWeaponBuilder{ 0 };
+    int CTFTeam{ 0 };
+    int CTFTauntProp{ 0 };
+    int CTFProjectile_Rocket{ 0 };
+    int CTFProjectile_Flare{ 0 };
+    int CTFProjectile_EnergyBall{ 0 };
+    int CTFProjectile_GrapplingHook{ 0 };
+    int CTFProjectile_HealingBolt{ 0 };
+    int CTFProjectile_Arrow{ 0 };
+    int CTFPlayerResource{ 0 };
+    int CTFPlayer{ 0 };
+    int CTFRagdoll{ 0 };
+    int CTEPlayerAnimEvent{ 0 };
+    int CTFPasstimeLogic{ 0 };
+    int CPasstimeBall{ 0 };
+    int CTFObjectiveResource{ 0 };
+    int CTFGlow{ 0 };
+    int CTEFireBullets{ 0 };
+    int CTFBuffBanner{ 0 };
+    int CTFAmmoPack{ 0 };
+    int CObjectTeleporter{ 0 };
+    int CObjectSentrygun{ 0 };
+    int CTFProjectile_SentryRocket{ 0 };
+    int CObjectSapper{ 0 };
+    int CObjectCartDispenser{ 0 };
+    int CObjectDispenser{ 0 };
+    int CMonsterResource{ 0 };
+    int CFuncRespawnRoomVisualizer{ 0 };
+    int CFuncRespawnRoom{ 0 };
+    int CFuncPasstimeGoal{ 0 };
+    int CFuncForceField{ 0 };
+    int CCaptureZone{ 0 };
+    int CCurrencyPack{ 0 };
+    int CBaseObject{ 0 };
+    int CTFBotHintEngineerNest{ 0 };
+    int CBotNPCMinion{ 0 };
+    int CBotNPC{ 0 };
+    int CRagdollPropAttached{ 0 };
+    int CRagdollProp{ 0 };
+    int NextBotCombatCharacter{ 0 };
+    int CWaterBullet{ 0 };
+    int CFuncMonitor{ 0 };
+    int CWorld{ 0 };
+    int CWaterLODControl{ 0 };
+    int CVGuiScreen{ 0 };
+    int CPropJeep{ 0 };
+    int CPropVehicleChoreoGeneric{ 0 };
+    int CTEWorldDecal{ 0 };
+    int CTESpriteSpray{ 0 };
+    int CTESprite{ 0 };
+    int CTESparks{ 0 };
+    int CTESmoke{ 0 };
+    int CTEShowLine{ 0 };
+    int CTEProjectedDecal{ 0 };
+    int CTEPlayerDecal{ 0 };
+    int CTEPhysicsProp{ 0 };
+    int CTEParticleSystem{ 0 };
+    int CTEMuzzleFlash{ 0 };
+    int CTELargeFunnel{ 0 };
+    int CTEKillPlayerAttachments{ 0 };
+    int CTEImpact{ 0 };
+    int CTEGlowSprite{ 0 };
+    int CTEShatterSurface{ 0 };
+    int CTEFootprintDecal{ 0 };
+    int CTEFizz{ 0 };
+    int CTEExplosion{ 0 };
+    int CTEEnergySplash{ 0 };
+    int CTEEffectDispatch{ 0 };
+    int CTEDynamicLight{ 0 };
+    int CTEDecal{ 0 };
+    int CTEClientProjectile{ 0 };
+    int CTEBubbleTrail{ 0 };
+    int CTEBubbles{ 0 };
+    int CTEBSPDecal{ 0 };
+    int CTEBreakModel{ 0 };
+    int CTEBloodStream{ 0 };
+    int CTEBloodSprite{ 0 };
+    int CTEBeamSpline{ 0 };
+    int CTEBeamRingPoint{ 0 };
+    int CTEBeamRing{ 0 };
+    int CTEBeamPoints{ 0 };
+    int CTEBeamLaser{ 0 };
+    int CTEBeamFollow{ 0 };
+    int CTEBeamEnts{ 0 };
+    int CTEBeamEntPoint{ 0 };
+    int CTEBaseBeam{ 0 };
+    int CTEArmorRicochet{ 0 };
+    int CTEMetalSparks{ 0 };
+    int CTest_ProxyToggle_Networkable{ 0 };
+    int CTestTraceline{ 0 };
+    int CTesla{ 0 };
+    int CTeamTrainWatcher{ 0 };
+    int CBaseTeamObjectiveResource{ 0 };
+    int CTeam{ 0 };
+    int CSun{ 0 };
+    int CSteamJet{ 0 };
+    int CParticlePerformanceMonitor{ 0 };
+    int CSpotlightEnd{ 0 };
+    int DustTrail{ 0 };
+    int CFireTrail{ 0 };
+    int SporeTrail{ 0 };
+    int SporeExplosion{ 0 };
+    int RocketTrail{ 0 };
+    int SmokeTrail{ 0 };
+    int CSmokeStack{ 0 };
+    int CSlideshowDisplay{ 0 };
+    int CShadowControl{ 0 };
+    int CSceneEntity{ 0 };
+    int CRopeKeyframe{ 0 };
+    int CRagdollManager{ 0 };
+    int CPropVehicleDriveable{ 0 };
+    int CPhysicsPropMultiplayer{ 0 };
+    int CPhysBoxMultiplayer{ 0 };
+    int CBasePropDoor{ 0 };
+    int CDynamicProp{ 0 };
+    int CPointCommentaryNode{ 0 };
+    int CPointCamera{ 0 };
+    int CPlayerResource{ 0 };
+    int CPlasma{ 0 };
+    int CPhysMagnet{ 0 };
+    int CPhysicsProp{ 0 };
+    int CPhysBox{ 0 };
+    int CParticleSystem{ 0 };
+    int ParticleSmokeGrenade{ 0 };
+    int CParticleFire{ 0 };
+    int MovieExplosion{ 0 };
+    int CMaterialModifyControl{ 0 };
+    int CLightGlow{ 0 };
+    int CInfoOverlayAccessor{ 0 };
+    int CTEGaussExplosion{ 0 };
+    int CFuncTrackTrain{ 0 };
+    int CFuncSmokeVolume{ 0 };
+    int CFuncRotating{ 0 };
+    int CFuncReflectiveGlass{ 0 };
+    int CFuncOccluder{ 0 };
+    int CFunc_LOD{ 0 };
+    int CTEDust{ 0 };
+    int CFunc_Dust{ 0 };
+    int CFuncConveyor{ 0 };
+    int CBreakableSurface{ 0 };
+    int CFuncAreaPortalWindow{ 0 };
+    int CFish{ 0 };
+    int CEntityFlame{ 0 };
+    int CFireSmoke{ 0 };
+    int CEnvTonemapController{ 0 };
+    int CEnvScreenEffect{ 0 };
+    int CEnvScreenOverlay{ 0 };
+    int CEnvProjectedTexture{ 0 };
+    int CEnvParticleScript{ 0 };
+    int CFogController{ 0 };
+    int CEntityParticleTrail{ 0 };
+    int CEntityDissolve{ 0 };
+    int CEnvQuadraticBeam{ 0 };
+    int CEmbers{ 0 };
+    int CEnvWind{ 0 };
+    int CPrecipitation{ 0 };
+    int CDynamicLight{ 0 };
+    int CColorCorrectionVolume{ 0 };
+    int CColorCorrection{ 0 };
+    int CBreakableProp{ 0 };
+    int CBaseTempEntity{ 0 };
+    int CBasePlayer{ 0 };
+    int CBaseFlex{ 0 };
+    int CBaseEntity{ 0 };
+    int CBaseDoor{ 0 };
+    int CBaseCombatCharacter{ 0 };
+    int CBaseAnimatingOverlay{ 0 };
+    int CBoneFollower{ 0 };
+    int CBaseAnimating{ 0 };
+    int CInfoLightingRelative{ 0 };
+    int CAI_BaseNPC{ 0 };
+    int CWeaponIFMSteadyCam{ 0 };
+    int CWeaponIFMBaseCamera{ 0 };
+    int CWeaponIFMBase{ 0 };
+    int CTFWearableLevelableItem{ 0 };
+    int CTFWearableDemoShield{ 0 };
+    int CTFWearableRobotArm{ 0 };
+    int CTFRobotArm{ 0 };
+    int CTFWrench{ 0 };
+    int CTFProjectile_ThrowableBreadMonster{ 0 };
+    int CTFProjectile_ThrowableBrick{ 0 };
+    int CTFProjectile_ThrowableRepel{ 0 };
+    int CTFProjectile_Throwable{ 0 };
+    int CTFThrowable{ 0 };
+    int CTFSyringeGun{ 0 };
+    int CTFKatana{ 0 };
+    int CTFSword{ 0 };
+    int CSniperDot{ 0 };
+    int CTFSniperRifleClassic{ 0 };
+    int CTFSniperRifleDecap{ 0 };
+    int CTFSniperRifle{ 0 };
+    int CTFChargedSMG{ 0 };
+    int CTFSMG{ 0 };
+    int CTFShovel{ 0 };
+    int CTFShotgunBuildingRescue{ 0 };
+    int CTFPEPBrawlerBlaster{ 0 };
+    int CTFSodaPopper{ 0 };
+    int CTFShotgun_Revenge{ 0 };
+    int CTFScatterGun{ 0 };
+    int CTFShotgun_Pyro{ 0 };
+    int CTFShotgun_HWG{ 0 };
+    int CTFShotgun_Soldier{ 0 };
+    int CTFShotgun{ 0 };
+    int CTFCrossbow{ 0 };
+    int CTFRocketLauncher_Mortar{ 0 };
+    int CTFRocketLauncher_AirStrike{ 0 };
+    int CTFRocketLauncher_DirectHit{ 0 };
+    int CTFRocketLauncher{ 0 };
+    int CTFRevolver{ 0 };
+    int CTFDRGPomson{ 0 };
+    int CTFRaygun{ 0 };
+    int CTFPistol_ScoutSecondary{ 0 };
+    int CTFPistol_ScoutPrimary{ 0 };
+    int CTFPistol_Scout{ 0 };
+    int CTFPistol{ 0 };
+    int CTFPipebombLauncher{ 0 };
+    int CTFWeaponPDA_Spy{ 0 };
+    int CTFWeaponPDA_Engineer_Destroy{ 0 };
+    int CTFWeaponPDA_Engineer_Build{ 0 };
+    int CTFWeaponPDAExpansion_Teleporter{ 0 };
+    int CTFWeaponPDAExpansion_Dispenser{ 0 };
+    int CTFWeaponPDA{ 0 };
+    int CPasstimeGun{ 0 };
+    int CTFParticleCannon{ 0 };
+    int CTFParachute_Secondary{ 0 };
+    int CTFParachute_Primary{ 0 };
+    int CTFParachute{ 0 };
+    int CTFMinigun{ 0 };
+    int CTFMedigunShield{ 0 };
+    int CWeaponMedigun{ 0 };
+    int CTFMechanicalArm{ 0 };
+    int CTFLunchBox_Drink{ 0 };
+    int CTFLunchBox{ 0 };
+    int CLaserDot{ 0 };
+    int CTFLaserPointer{ 0 };
+    int CTFKnife{ 0 };
+    int CTFProjectile_Cleaver{ 0 };
+    int CTFProjectile_JarMilk{ 0 };
+    int CTFProjectile_Jar{ 0 };
+    int CTFCleaver{ 0 };
+    int CTFJarMilk{ 0 };
+    int CTFJar{ 0 };
+    int CTFWeaponInvis{ 0 };
+    int CTFGrenadePipebombProjectile{ 0 };
+    int CTFCannon{ 0 };
+    int CTFGrenadeLauncher{ 0 };
+    int CTFGrapplingHook{ 0 };
+    int CTFFlareGun_Revenge{ 0 };
+    int CTFFlareGun{ 0 };
+    int CTFFlameRocket{ 0 };
+    int CTFFlameThrower{ 0 };
+    int CTFFists{ 0 };
+    int CTFFireAxe{ 0 };
+    int CTFCompoundBow{ 0 };
+    int CTFClub{ 0 };
+    int CTFBuffItem{ 0 };
+    int CTFStickBomb{ 0 };
+    int CTFBottle{ 0 };
+    int CTFBonesaw{ 0 };
+    int CTFBall_Ornament{ 0 };
+    int CTFStunBall{ 0 };
+    int CTFBat_Giftwrap{ 0 };
+    int CTFBat_Wood{ 0 };
+    int CTFBat_Fish{ 0 };
+    int CTFBat{ 0 };
+    int CTFBaseRocket{ 0 };
+    int CTFWeaponBaseMerasmusGrenade{ 0 };
+    int CTFWeaponBaseMelee{ 0 };
+    int CTFWeaponBaseGun{ 0 };
+    int CTFWeaponBaseGrenadeProj{ 0 };
+    int CTFWeaponBase{ 0 };
+    int CTFViewModel{ 0 };
+    int CRobotDispenser{ 0 };
+    int CTFRobotDestruction_Robot{ 0 };
+    int CTFReviveMarker{ 0 };
+    int CTFPumpkinBomb{ 0 };
+    int CTFProjectile_EnergyRing{ 0 };
+    int CTFBaseProjectile{ 0 };
+    int CBaseObjectUpgrade{ 0 };
+    int CMannVsMachineStats{ 0 };
+    int CTFRobotDestructionLogic{ 0 };
+    int CTFRobotDestruction_RobotGroup{ 0 };
+    int CTFRobotDestruction_RobotSpawn{ 0 };
+    int CTFPlayerDestructionLogic{ 0 };
+    int CPlayerDestructionDispenser{ 0 };
+    int CTFMinigameLogic{ 0 };
+    int CTFHalloweenMinigame_FallingPlatforms{ 0 };
+    int CTFHalloweenMinigame{ 0 };
+    int CTFMiniGame{ 0 };
+    int CTFWearableVM{ 0 };
+    int CTFWearable{ 0 };
+    int CTFPowerupBottle{ 0 };
+    int CTFItem{ 0 };
+    int CHalloweenSoulPack{ 0 };
+    int CTFGenericBomb{ 0 };
+    int CBonusRoundLogic{ 0 };
+    int CTFGameRulesProxy{ 0 };
+    int CTFDroppedWeapon{ 0 };
+    int CTFProjectile_SpellKartBats{ 0 };
+    int CTFProjectile_SpellKartOrb{ 0 };
+    int CTFHellZap{ 0 };
+    int CTFProjectile_SpellLightningOrb{ 0 };
+    int CTFProjectile_SpellTransposeTeleport{ 0 };
+    int CTFProjectile_SpellMeteorShower{ 0 };
+    int CTFProjectile_SpellSpawnBoss{ 0 };
+    int CTFProjectile_SpellMirv{ 0 };
+    int CTFProjectile_SpellPumpkin{ 0 };
+    int CTFProjectile_SpellSpawnHorde{ 0 };
+    int CTFProjectile_SpellSpawnZombie{ 0 };
+    int CTFProjectile_SpellBats{ 0 };
+    int CTFProjectile_SpellFireball{ 0 };
+    int CTFSpellBook{ 0 };
+    int CHightower_TeleportVortex{ 0 };
+    int CTeleportVortex{ 0 };
+    int CHalloweenGiftPickup{ 0 };
+    int CBonusDuckPickup{ 0 };
+    int CHalloweenPickup{ 0 };
+    int CCaptureFlagReturnIcon{ 0 };
+    int CCaptureFlag{ 0 };
+    int CBonusPack{ 0 };
+    int CHandleTest{ 0 };
+    int CTeamRoundTimer{ 0 };
+    int CTeamplayRoundBasedRulesProxy{ 0 };
+    int CSpriteTrail{ 0 };
+    int CSpriteOriented{ 0 };
+    int CSprite{ 0 };
+    int CPoseController{ 0 };
+    int CGameRulesProxy{ 0 };
+    int CInfoLadderDismount{ 0 };
+    int CFuncLadder{ 0 };
+    int CEnvDetailController{ 0 };
+    int CTFWearableItem{ 0 };
+    int CEconWearable{ 0 };
+    int CBaseAttributableItem{ 0 };
+    int CEconEntity{ 0 };
+    int CBeam{ 0 };
+    int CBaseViewModel{ 0 };
+    int CBaseProjectile{ 0 };
+    int CBaseParticleEntity{ 0 };
+    int CBaseGrenade{ 0 };
+    int CBaseCombatWeapon{ 0 };
+    int CVoteController{ 0 };
+    int CTEHL2MPFireBullets{ 0 };
+    int CHL2MPRagdoll{ 0 };
+    int CHL2MP_Player{ 0 };
+    int CWeaponCitizenSuitcase{ 0 };
+    int CWeaponCitizenPackage{ 0 };
+    int CWeaponAlyxGun{ 0 };
+    int CWeaponCubemap{ 0 };
+    int CWeaponGaussGun{ 0 };
+    int CWeaponAnnabelle{ 0 };
+    int CFlaregun{ 0 };
+    int CWeaponBugBait{ 0 };
+    int CWeaponBinoculars{ 0 };
+    int CWeaponCycler{ 0 };
+    int CCrossbowBolt{ 0 };
+    int CPropVehiclePrisonerPod{ 0 };
+    int CPropCrane{ 0 };
+    int CPropCannon{ 0 };
+    int CPropAirboat{ 0 };
+    int CFlare{ 0 };
+    int CTEConcussiveExplosion{ 0 };
+    int CNPC_Strider{ 0 };
+    int CScriptIntro{ 0 };
+    int CRotorWashEmitter{ 0 };
+    int CPropCombineBall{ 0 };
+    int CPlasmaBeamNode{ 0 };
+    int CNPC_RollerMine{ 0 };
+    int CNPC_Manhack{ 0 };
+    int CNPC_CombineGunship{ 0 };
+    int CNPC_AntlionGuard{ 0 };
+    int CInfoTeleporterCountdown{ 0 };
+    int CMortarShell{ 0 };
+    int CEnvStarfield{ 0 };
+    int CEnvHeadcrabCanister{ 0 };
+    int CAlyxEmpEffect{ 0 };
+    int CCorpse{ 0 };
+    int CCitadelEnergyCore{ 0 };
+    int CHL2_Player{ 0 };
+    int CBaseHLBludgeonWeapon{ 0 };
+    int CHLSelectFireMachineGun{ 0 };
+    int CHLMachineGun{ 0 };
+    int CBaseHelicopter{ 0 };
+    int CNPC_Barney{ 0 };
+    int CNPC_Barnacle{ 0 };
+    int AR2Explosion{ 0 };
+    int CTEAntlionDust{ 0 };
+    int CVortigauntEffectDispel{ 0 };
+    int CVortigauntChargeToken{ 0 };
+    int CNPC_Vortigaunt{ 0 };
+    int CPredictedViewModel{ 0 };
+    int CWeaponStunStick{ 0 };
+    int CWeaponSMG1{ 0 };
+    int CWeapon_SLAM{ 0 };
+    int CWeaponShotgun{ 0 };
+    int CWeaponRPG{ 0 };
+    int CWeaponPistol{ 0 };
+    int CWeaponPhysCannon{ 0 };
+    int CHL2MPMachineGun{ 0 };
+    int CBaseHL2MPCombatWeapon{ 0 };
+    int CBaseHL2MPBludgeonWeapon{ 0 };
+    int CWeaponHL2MPBase{ 0 };
+    int CWeaponFrag{ 0 };
+    int CWeaponCrowbar{ 0 };
+    int CWeaponCrossbow{ 0 };
+    int CWeaponAR2{ 0 };
+    int CWeapon357{ 0 };
+    int CHL2MPGameRulesProxy{ 0 };
+    int CHalfLife2Proxy{ 0 };
+    int CBaseHLCombatWeapon{ 0 };
+    int CTFVehicle{ 0 };
+    int CTFBaseDMPowerup{ 0 };
+    int CWeaponSpawner{ 0 };
+    int CTFUmbrella{ 0 };
+    int CTFTranq{ 0 };
+    int CTFSMG_Primary{ 0 };
+    int CTFRevolver_Secondary{ 0 };
+    int CTFNailgun{ 0 };
+    int CTFHunterRifle{ 0 };
+    int CTFHeavyArtillery{ 0 };
+    int CTFHammerfists{ 0 };
+    int CTFCrowbar{ 0 };
+    int CTFChainsaw{ 0 };
+    int CTEPlantBomb{ 0 };
+    int CTERadioIcon{ 0 };
+    int CPlantedC4{ 0 };
+    int CCSTeam{ 0 };
+    int CCSPlayerResource{ 0 };
+    int CCSPlayer{ 0 };
+    int CCSRagdoll{ 0 };
+    int CHostage{ 0 };
+    int CWeaponXM1014{ 0 };
+    int CWeaponUSP{ 0 };
+    int CWeaponUMP45{ 0 };
+    int CWeaponTMP{ 0 };
+    int CSmokeGrenade{ 0 };
+    int CWeaponSG552{ 0 };
+    int CWeaponSG550{ 0 };
+    int CWeaponScout{ 0 };
+    int CWeaponP90{ 0 };
+    int CWeaponP228{ 0 };
+    int CWeaponMP5Navy{ 0 };
+    int CWeaponMAC10{ 0 };
+    int CWeaponM4A1{ 0 };
+    int CWeaponM3{ 0 };
+    int CWeaponM249{ 0 };
+    int CKnife{ 0 };
+    int CHEGrenade{ 0 };
+    int CWeaponGlock{ 0 };
+    int CWeaponGalil{ 0 };
+    int CWeaponG3SG1{ 0 };
+    int CFlashbang{ 0 };
+    int CWeaponFiveSeven{ 0 };
+    int CWeaponFamas{ 0 };
+    int CWeaponElite{ 0 };
+    int CDEagle{ 0 };
+    int CWeaponCSBaseGun{ 0 };
+    int CWeaponCSBase{ 0 };
+    int CC4{ 0 };
+    int CBaseCSGrenade{ 0 };
+    int CWeaponAWP{ 0 };
+    int CWeaponAug{ 0 };
+    int CAK47{ 0 };
+    int CFootstepControl{ 0 };
+    int CCSGameRulesProxy{ 0 };
+    int CBaseCSGrenadeProjectile{ 0 };
+    int CSDKTeam_Deathmatch{ 0 };
+    int CSDKTeam_Red{ 0 };
+    int CSDKTeam_Blue{ 0 };
+    int CSDKTeam_Unassigned{ 0 };
+    int CSDKTeam{ 0 };
+    int CSDKPlayerResource{ 0 };
+    int CSDKRagdoll{ 0 };
+    int CSDKPlayer{ 0 };
+    int CSparkler{ 0 };
+    int CRatRaceWaypoint{ 0 };
+    int CBriefcaseCaptureZone{ 0 };
+    int CBriefcase{ 0 };
+    int CWeaponSDKBase{ 0 };
+    int CWeaponMP5K{ 0 };
+    int CWeaponMossberg{ 0 };
+    int CWeaponM1911{ 0 };
+    int CWeaponM16{ 0 };
+    int CWeaponGrenade{ 0 };
+    int CWeaponFAL{ 0 };
+    int CWeaponBrawl{ 0 };
+    int CWeaponBeretta{ 0 };
+    int CBaseSDKGrenade{ 0 };
+    int CAkimboM1911{ 0 };
+    int CAkimboBeretta{ 0 };
+    int CAkimboBase{ 0 };
+    int CWeaponSDKMelee{ 0 };
+    int CSDKGameRulesProxy{ 0 };
+    int CBaseGrenadeProjectile{ 0 };
+    int CDAViewModel{ 0 };
+    int CTFWearableRazorback{ 0 };
+    int CTFWearableCampaignItem{ 0 };
+    int CTFSlap{ 0 };
+    int CTFRocketPack{ 0 };
+    int CTFGasManager{ 0 };
+    int CTFProjectile_JarGas{ 0 };
+    int CTFJarGas{ 0 };
+    int CTFWeaponFlameBall{ 0 };
+    int CTFBreakableSign{ 0 };
+    int CTFBreakableMelee{ 0 };
+    int CTFProjectile_BallOfFire{ 0 };
+    int CTFPointManager{ 0 };
+    int CTFFlameManager{ 0 };
+};
+
+extern dynamic dynamic_list;
 }
 
 #endif /* DYNAMIC_AUTOGEN_HPP */
\ No newline at end of file
diff --git a/include/fidgetspinner.hpp b/include/fidgetspinner.hpp
index 0d54c2f8..d7e3d251 100755
--- a/include/fidgetspinner.hpp
+++ b/include/fidgetspinner.hpp
@@ -15,6 +15,6 @@ class CatVar;
 extern std::array<textures::sprite, 4> spinner_states;
 
 extern CatVar enable_spinner;
-
+extern CatVar v9mode;
 void InitSpinner();
 void DrawSpinner();
diff --git a/include/reclasses/CTFPartyClient.hpp b/include/reclasses/CTFPartyClient.hpp
index 237aa811..46d9079a 100755
--- a/include/reclasses/CTFPartyClient.hpp
+++ b/include/reclasses/CTFPartyClient.hpp
@@ -16,10 +16,10 @@ public:
     static CTFPartyClient *GTFPartyClient();
 
     static int SendPartyChat(CTFPartyClient *client, const char *message);
-    static int LoadSavedCasualCriteria(CTFPartyClient *client);
+    int LoadSavedCasualCriteria();
     static ITFGroupMatchCriteria *MutLocalGroupCriteria(CTFPartyClient *client);
     static bool BCanQueueForStandby(CTFPartyClient *this_);
-    static void RequestQueueForMatch(CTFPartyClient *client);
+    char RequestQueueForMatch(int type);
     static bool BInQueue(CTFPartyClient *this_);
 };
 }
diff --git a/include/reclasses/ITFGroupMatchCriteria.hpp b/include/reclasses/ITFGroupMatchCriteria.hpp
index 1a8879ed..fb463afb 100755
--- a/include/reclasses/ITFGroupMatchCriteria.hpp
+++ b/include/reclasses/ITFGroupMatchCriteria.hpp
@@ -17,7 +17,15 @@ class ITFGroupMatchCriteria
 public:
     enum group
     {
-        CASUAL = 7
+    	MvmPractice = 0,
+		MvmMannup = 1,
+		LadderMatch6v6 = 2,
+		LadderMatch9v9 = 3,
+		LadderMatch12v12 = 4,
+		CasualMatch6v6 = 5,
+		CasualMatch9v9 = 6,
+		CasualMatch12v12 = 7,
+		CompetitiveEventMatch12v12 = 8
     };
 
 public:
diff --git a/res/atlas.png b/res/atlas.png
index 6b85b00b..3498cd61 100755
Binary files a/res/atlas.png and b/res/atlas.png differ
diff --git a/src/classinfo/dynamic.gen.cpp b/src/classinfo/dynamic.gen.cpp
old mode 100755
new mode 100644
index 90d0acc8..282e597b
--- a/src/classinfo/dynamic.gen.cpp
+++ b/src/classinfo/dynamic.gen.cpp
@@ -3,545 +3,574 @@
 #include "classinfo/dynamic.gen.hpp"
 #include "common.hpp"
 
-namespace client_classes {
-	
-std::unordered_map<std::string, int*> classid_mapping {};
-	
-dynamic::dynamic() {
-		classid_mapping["CTETFParticleEffect"] = &CTETFParticleEffect;
-		classid_mapping["CTETFExplosion"] = &CTETFExplosion;
-		classid_mapping["CTETFBlood"] = &CTETFBlood;
-		classid_mapping["CTFTankBoss"] = &CTFTankBoss;
-		classid_mapping["CTFBaseBoss"] = &CTFBaseBoss;
-		classid_mapping["CBossAlpha"] = &CBossAlpha;
-		classid_mapping["CZombie"] = &CZombie;
-		classid_mapping["CMerasmusDancer"] = &CMerasmusDancer;
-		classid_mapping["CMerasmus"] = &CMerasmus;
-		classid_mapping["CHeadlessHatman"] = &CHeadlessHatman;
-		classid_mapping["CEyeballBoss"] = &CEyeballBoss;
-		classid_mapping["CTFWeaponSapper"] = &CTFWeaponSapper;
-		classid_mapping["CTFWeaponBuilder"] = &CTFWeaponBuilder;
-		classid_mapping["C_TFWeaponBuilder"] = &C_TFWeaponBuilder;
-		classid_mapping["CTFTeam"] = &CTFTeam;
-		classid_mapping["CTFTauntProp"] = &CTFTauntProp;
-		classid_mapping["CTFProjectile_Rocket"] = &CTFProjectile_Rocket;
-		classid_mapping["CTFProjectile_Flare"] = &CTFProjectile_Flare;
-		classid_mapping["CTFProjectile_EnergyBall"] = &CTFProjectile_EnergyBall;
-		classid_mapping["CTFProjectile_GrapplingHook"] = &CTFProjectile_GrapplingHook;
-		classid_mapping["CTFProjectile_HealingBolt"] = &CTFProjectile_HealingBolt;
-		classid_mapping["CTFProjectile_Arrow"] = &CTFProjectile_Arrow;
-		classid_mapping["CTFPlayerResource"] = &CTFPlayerResource;
-		classid_mapping["CTFPlayer"] = &CTFPlayer;
-		classid_mapping["CTFRagdoll"] = &CTFRagdoll;
-		classid_mapping["CTEPlayerAnimEvent"] = &CTEPlayerAnimEvent;
-		classid_mapping["CTFPasstimeLogic"] = &CTFPasstimeLogic;
-		classid_mapping["CPasstimeBall"] = &CPasstimeBall;
-		classid_mapping["CTFObjectiveResource"] = &CTFObjectiveResource;
-		classid_mapping["CTFGlow"] = &CTFGlow;
-		classid_mapping["CTEFireBullets"] = &CTEFireBullets;
-		classid_mapping["CTFBuffBanner"] = &CTFBuffBanner;
-		classid_mapping["CTFAmmoPack"] = &CTFAmmoPack;
-		classid_mapping["CObjectTeleporter"] = &CObjectTeleporter;
-		classid_mapping["CObjectSentrygun"] = &CObjectSentrygun;
-		classid_mapping["CTFProjectile_SentryRocket"] = &CTFProjectile_SentryRocket;
-		classid_mapping["CObjectSapper"] = &CObjectSapper;
-		classid_mapping["CObjectCartDispenser"] = &CObjectCartDispenser;
-		classid_mapping["CObjectDispenser"] = &CObjectDispenser;
-		classid_mapping["CMonsterResource"] = &CMonsterResource;
-		classid_mapping["CFuncRespawnRoomVisualizer"] = &CFuncRespawnRoomVisualizer;
-		classid_mapping["CFuncRespawnRoom"] = &CFuncRespawnRoom;
-		classid_mapping["CFuncPasstimeGoal"] = &CFuncPasstimeGoal;
-		classid_mapping["CFuncForceField"] = &CFuncForceField;
-		classid_mapping["CCaptureZone"] = &CCaptureZone;
-		classid_mapping["CCurrencyPack"] = &CCurrencyPack;
-		classid_mapping["CBaseObject"] = &CBaseObject;
-		classid_mapping["CTFBotHintEngineerNest"] = &CTFBotHintEngineerNest;
-		classid_mapping["CBotNPCMinion"] = &CBotNPCMinion;
-		classid_mapping["CBotNPC"] = &CBotNPC;
-		classid_mapping["CRagdollPropAttached"] = &CRagdollPropAttached;
-		classid_mapping["CRagdollProp"] = &CRagdollProp;
-		classid_mapping["NextBotCombatCharacter"] = &NextBotCombatCharacter;
-		classid_mapping["CWaterBullet"] = &CWaterBullet;
-		classid_mapping["CFuncMonitor"] = &CFuncMonitor;
-		classid_mapping["CWorld"] = &CWorld;
-		classid_mapping["CWaterLODControl"] = &CWaterLODControl;
-		classid_mapping["CVGuiScreen"] = &CVGuiScreen;
-		classid_mapping["CPropJeep"] = &CPropJeep;
-		classid_mapping["CPropVehicleChoreoGeneric"] = &CPropVehicleChoreoGeneric;
-		classid_mapping["CTEWorldDecal"] = &CTEWorldDecal;
-		classid_mapping["CTESpriteSpray"] = &CTESpriteSpray;
-		classid_mapping["CTESprite"] = &CTESprite;
-		classid_mapping["CTESparks"] = &CTESparks;
-		classid_mapping["CTESmoke"] = &CTESmoke;
-		classid_mapping["CTEShowLine"] = &CTEShowLine;
-		classid_mapping["CTEProjectedDecal"] = &CTEProjectedDecal;
-		classid_mapping["CTEPlayerDecal"] = &CTEPlayerDecal;
-		classid_mapping["CTEPhysicsProp"] = &CTEPhysicsProp;
-		classid_mapping["CTEParticleSystem"] = &CTEParticleSystem;
-		classid_mapping["CTEMuzzleFlash"] = &CTEMuzzleFlash;
-		classid_mapping["CTELargeFunnel"] = &CTELargeFunnel;
-		classid_mapping["CTEKillPlayerAttachments"] = &CTEKillPlayerAttachments;
-		classid_mapping["CTEImpact"] = &CTEImpact;
-		classid_mapping["CTEGlowSprite"] = &CTEGlowSprite;
-		classid_mapping["CTEShatterSurface"] = &CTEShatterSurface;
-		classid_mapping["CTEFootprintDecal"] = &CTEFootprintDecal;
-		classid_mapping["CTEFizz"] = &CTEFizz;
-		classid_mapping["CTEExplosion"] = &CTEExplosion;
-		classid_mapping["CTEEnergySplash"] = &CTEEnergySplash;
-		classid_mapping["CTEEffectDispatch"] = &CTEEffectDispatch;
-		classid_mapping["CTEDynamicLight"] = &CTEDynamicLight;
-		classid_mapping["CTEDecal"] = &CTEDecal;
-		classid_mapping["CTEClientProjectile"] = &CTEClientProjectile;
-		classid_mapping["CTEBubbleTrail"] = &CTEBubbleTrail;
-		classid_mapping["CTEBubbles"] = &CTEBubbles;
-		classid_mapping["CTEBSPDecal"] = &CTEBSPDecal;
-		classid_mapping["CTEBreakModel"] = &CTEBreakModel;
-		classid_mapping["CTEBloodStream"] = &CTEBloodStream;
-		classid_mapping["CTEBloodSprite"] = &CTEBloodSprite;
-		classid_mapping["CTEBeamSpline"] = &CTEBeamSpline;
-		classid_mapping["CTEBeamRingPoint"] = &CTEBeamRingPoint;
-		classid_mapping["CTEBeamRing"] = &CTEBeamRing;
-		classid_mapping["CTEBeamPoints"] = &CTEBeamPoints;
-		classid_mapping["CTEBeamLaser"] = &CTEBeamLaser;
-		classid_mapping["CTEBeamFollow"] = &CTEBeamFollow;
-		classid_mapping["CTEBeamEnts"] = &CTEBeamEnts;
-		classid_mapping["CTEBeamEntPoint"] = &CTEBeamEntPoint;
-		classid_mapping["CTEBaseBeam"] = &CTEBaseBeam;
-		classid_mapping["CTEArmorRicochet"] = &CTEArmorRicochet;
-		classid_mapping["CTEMetalSparks"] = &CTEMetalSparks;
-		classid_mapping["CTest_ProxyToggle_Networkable"] = &CTest_ProxyToggle_Networkable;
-		classid_mapping["CTestTraceline"] = &CTestTraceline;
-		classid_mapping["CTesla"] = &CTesla;
-		classid_mapping["CTeamTrainWatcher"] = &CTeamTrainWatcher;
-		classid_mapping["CBaseTeamObjectiveResource"] = &CBaseTeamObjectiveResource;
-		classid_mapping["CTeam"] = &CTeam;
-		classid_mapping["CSun"] = &CSun;
-		classid_mapping["CSteamJet"] = &CSteamJet;
-		classid_mapping["CParticlePerformanceMonitor"] = &CParticlePerformanceMonitor;
-		classid_mapping["CSpotlightEnd"] = &CSpotlightEnd;
-		classid_mapping["DustTrail"] = &DustTrail;
-		classid_mapping["CFireTrail"] = &CFireTrail;
-		classid_mapping["SporeTrail"] = &SporeTrail;
-		classid_mapping["SporeExplosion"] = &SporeExplosion;
-		classid_mapping["RocketTrail"] = &RocketTrail;
-		classid_mapping["SmokeTrail"] = &SmokeTrail;
-		classid_mapping["CSmokeStack"] = &CSmokeStack;
-		classid_mapping["CSlideshowDisplay"] = &CSlideshowDisplay;
-		classid_mapping["CShadowControl"] = &CShadowControl;
-		classid_mapping["CSceneEntity"] = &CSceneEntity;
-		classid_mapping["CRopeKeyframe"] = &CRopeKeyframe;
-		classid_mapping["CRagdollManager"] = &CRagdollManager;
-		classid_mapping["CPropVehicleDriveable"] = &CPropVehicleDriveable;
-		classid_mapping["CPhysicsPropMultiplayer"] = &CPhysicsPropMultiplayer;
-		classid_mapping["CPhysBoxMultiplayer"] = &CPhysBoxMultiplayer;
-		classid_mapping["CBasePropDoor"] = &CBasePropDoor;
-		classid_mapping["CDynamicProp"] = &CDynamicProp;
-		classid_mapping["CPointCommentaryNode"] = &CPointCommentaryNode;
-		classid_mapping["CPointCamera"] = &CPointCamera;
-		classid_mapping["CPlayerResource"] = &CPlayerResource;
-		classid_mapping["CPlasma"] = &CPlasma;
-		classid_mapping["CPhysMagnet"] = &CPhysMagnet;
-		classid_mapping["CPhysicsProp"] = &CPhysicsProp;
-		classid_mapping["CPhysBox"] = &CPhysBox;
-		classid_mapping["CParticleSystem"] = &CParticleSystem;
-		classid_mapping["ParticleSmokeGrenade"] = &ParticleSmokeGrenade;
-		classid_mapping["CParticleFire"] = &CParticleFire;
-		classid_mapping["MovieExplosion"] = &MovieExplosion;
-		classid_mapping["CMaterialModifyControl"] = &CMaterialModifyControl;
-		classid_mapping["CLightGlow"] = &CLightGlow;
-		classid_mapping["CInfoOverlayAccessor"] = &CInfoOverlayAccessor;
-		classid_mapping["CTEGaussExplosion"] = &CTEGaussExplosion;
-		classid_mapping["CFuncTrackTrain"] = &CFuncTrackTrain;
-		classid_mapping["CFuncSmokeVolume"] = &CFuncSmokeVolume;
-		classid_mapping["CFuncRotating"] = &CFuncRotating;
-		classid_mapping["CFuncReflectiveGlass"] = &CFuncReflectiveGlass;
-		classid_mapping["CFuncOccluder"] = &CFuncOccluder;
-		classid_mapping["CFunc_LOD"] = &CFunc_LOD;
-		classid_mapping["CTEDust"] = &CTEDust;
-		classid_mapping["CFunc_Dust"] = &CFunc_Dust;
-		classid_mapping["CFuncConveyor"] = &CFuncConveyor;
-		classid_mapping["CBreakableSurface"] = &CBreakableSurface;
-		classid_mapping["CFuncAreaPortalWindow"] = &CFuncAreaPortalWindow;
-		classid_mapping["CFish"] = &CFish;
-		classid_mapping["CEntityFlame"] = &CEntityFlame;
-		classid_mapping["CFireSmoke"] = &CFireSmoke;
-		classid_mapping["CEnvTonemapController"] = &CEnvTonemapController;
-		classid_mapping["CEnvScreenEffect"] = &CEnvScreenEffect;
-		classid_mapping["CEnvScreenOverlay"] = &CEnvScreenOverlay;
-		classid_mapping["CEnvProjectedTexture"] = &CEnvProjectedTexture;
-		classid_mapping["CEnvParticleScript"] = &CEnvParticleScript;
-		classid_mapping["CFogController"] = &CFogController;
-		classid_mapping["CEntityParticleTrail"] = &CEntityParticleTrail;
-		classid_mapping["CEntityDissolve"] = &CEntityDissolve;
-		classid_mapping["CEnvQuadraticBeam"] = &CEnvQuadraticBeam;
-		classid_mapping["CEmbers"] = &CEmbers;
-		classid_mapping["CEnvWind"] = &CEnvWind;
-		classid_mapping["CPrecipitation"] = &CPrecipitation;
-		classid_mapping["CDynamicLight"] = &CDynamicLight;
-		classid_mapping["CColorCorrectionVolume"] = &CColorCorrectionVolume;
-		classid_mapping["CColorCorrection"] = &CColorCorrection;
-		classid_mapping["CBreakableProp"] = &CBreakableProp;
-		classid_mapping["CBaseTempEntity"] = &CBaseTempEntity;
-		classid_mapping["CBasePlayer"] = &CBasePlayer;
-		classid_mapping["CBaseFlex"] = &CBaseFlex;
-		classid_mapping["CBaseEntity"] = &CBaseEntity;
-		classid_mapping["CBaseDoor"] = &CBaseDoor;
-		classid_mapping["CBaseCombatCharacter"] = &CBaseCombatCharacter;
-		classid_mapping["CBaseAnimatingOverlay"] = &CBaseAnimatingOverlay;
-		classid_mapping["CBoneFollower"] = &CBoneFollower;
-		classid_mapping["CBaseAnimating"] = &CBaseAnimating;
-		classid_mapping["CInfoLightingRelative"] = &CInfoLightingRelative;
-		classid_mapping["CAI_BaseNPC"] = &CAI_BaseNPC;
-		classid_mapping["CWeaponIFMSteadyCam"] = &CWeaponIFMSteadyCam;
-		classid_mapping["CWeaponIFMBaseCamera"] = &CWeaponIFMBaseCamera;
-		classid_mapping["CWeaponIFMBase"] = &CWeaponIFMBase;
-		classid_mapping["CTFWearableLevelableItem"] = &CTFWearableLevelableItem;
-		classid_mapping["CTFWearableDemoShield"] = &CTFWearableDemoShield;
-		classid_mapping["CTFWearableRobotArm"] = &CTFWearableRobotArm;
-		classid_mapping["CTFRobotArm"] = &CTFRobotArm;
-		classid_mapping["CTFWrench"] = &CTFWrench;
-		classid_mapping["CTFProjectile_ThrowableBreadMonster"] = &CTFProjectile_ThrowableBreadMonster;
-		classid_mapping["CTFProjectile_ThrowableBrick"] = &CTFProjectile_ThrowableBrick;
-		classid_mapping["CTFProjectile_ThrowableRepel"] = &CTFProjectile_ThrowableRepel;
-		classid_mapping["CTFProjectile_Throwable"] = &CTFProjectile_Throwable;
-		classid_mapping["CTFThrowable"] = &CTFThrowable;
-		classid_mapping["CTFSyringeGun"] = &CTFSyringeGun;
-		classid_mapping["CTFKatana"] = &CTFKatana;
-		classid_mapping["CTFSword"] = &CTFSword;
-		classid_mapping["CSniperDot"] = &CSniperDot;
-		classid_mapping["CTFSniperRifleClassic"] = &CTFSniperRifleClassic;
-		classid_mapping["CTFSniperRifleDecap"] = &CTFSniperRifleDecap;
-		classid_mapping["CTFSniperRifle"] = &CTFSniperRifle;
-		classid_mapping["CTFChargedSMG"] = &CTFChargedSMG;
-		classid_mapping["CTFSMG"] = &CTFSMG;
-		classid_mapping["CTFShovel"] = &CTFShovel;
-		classid_mapping["CTFShotgunBuildingRescue"] = &CTFShotgunBuildingRescue;
-		classid_mapping["CTFPEPBrawlerBlaster"] = &CTFPEPBrawlerBlaster;
-		classid_mapping["CTFSodaPopper"] = &CTFSodaPopper;
-		classid_mapping["CTFShotgun_Revenge"] = &CTFShotgun_Revenge;
-		classid_mapping["CTFScatterGun"] = &CTFScatterGun;
-		classid_mapping["CTFShotgun_Pyro"] = &CTFShotgun_Pyro;
-		classid_mapping["CTFShotgun_HWG"] = &CTFShotgun_HWG;
-		classid_mapping["CTFShotgun_Soldier"] = &CTFShotgun_Soldier;
-		classid_mapping["CTFShotgun"] = &CTFShotgun;
-		classid_mapping["CTFCrossbow"] = &CTFCrossbow;
-		classid_mapping["CTFRocketLauncher_Mortar"] = &CTFRocketLauncher_Mortar;
-		classid_mapping["CTFRocketLauncher_AirStrike"] = &CTFRocketLauncher_AirStrike;
-		classid_mapping["CTFRocketLauncher_DirectHit"] = &CTFRocketLauncher_DirectHit;
-		classid_mapping["CTFRocketLauncher"] = &CTFRocketLauncher;
-		classid_mapping["CTFRevolver"] = &CTFRevolver;
-		classid_mapping["CTFDRGPomson"] = &CTFDRGPomson;
-		classid_mapping["CTFRaygun"] = &CTFRaygun;
-		classid_mapping["CTFPistol_ScoutSecondary"] = &CTFPistol_ScoutSecondary;
-		classid_mapping["CTFPistol_ScoutPrimary"] = &CTFPistol_ScoutPrimary;
-		classid_mapping["CTFPistol_Scout"] = &CTFPistol_Scout;
-		classid_mapping["CTFPistol"] = &CTFPistol;
-		classid_mapping["CTFPipebombLauncher"] = &CTFPipebombLauncher;
-		classid_mapping["CTFWeaponPDA_Spy"] = &CTFWeaponPDA_Spy;
-		classid_mapping["CTFWeaponPDA_Engineer_Destroy"] = &CTFWeaponPDA_Engineer_Destroy;
-		classid_mapping["CTFWeaponPDA_Engineer_Build"] = &CTFWeaponPDA_Engineer_Build;
-		classid_mapping["CTFWeaponPDAExpansion_Teleporter"] = &CTFWeaponPDAExpansion_Teleporter;
-		classid_mapping["CTFWeaponPDAExpansion_Dispenser"] = &CTFWeaponPDAExpansion_Dispenser;
-		classid_mapping["CTFWeaponPDA"] = &CTFWeaponPDA;
-		classid_mapping["CPasstimeGun"] = &CPasstimeGun;
-		classid_mapping["CTFParticleCannon"] = &CTFParticleCannon;
-		classid_mapping["CTFParachute_Secondary"] = &CTFParachute_Secondary;
-		classid_mapping["CTFParachute_Primary"] = &CTFParachute_Primary;
-		classid_mapping["CTFParachute"] = &CTFParachute;
-		classid_mapping["CTFMinigun"] = &CTFMinigun;
-		classid_mapping["CTFMedigunShield"] = &CTFMedigunShield;
-		classid_mapping["CWeaponMedigun"] = &CWeaponMedigun;
-		classid_mapping["CTFMechanicalArm"] = &CTFMechanicalArm;
-		classid_mapping["CTFLunchBox_Drink"] = &CTFLunchBox_Drink;
-		classid_mapping["CTFLunchBox"] = &CTFLunchBox;
-		classid_mapping["CLaserDot"] = &CLaserDot;
-		classid_mapping["CTFLaserPointer"] = &CTFLaserPointer;
-		classid_mapping["CTFKnife"] = &CTFKnife;
-		classid_mapping["CTFProjectile_Cleaver"] = &CTFProjectile_Cleaver;
-		classid_mapping["CTFProjectile_JarMilk"] = &CTFProjectile_JarMilk;
-		classid_mapping["CTFProjectile_Jar"] = &CTFProjectile_Jar;
-		classid_mapping["CTFCleaver"] = &CTFCleaver;
-		classid_mapping["CTFJarMilk"] = &CTFJarMilk;
-		classid_mapping["CTFJar"] = &CTFJar;
-		classid_mapping["CTFWeaponInvis"] = &CTFWeaponInvis;
-		classid_mapping["CTFGrenadePipebombProjectile"] = &CTFGrenadePipebombProjectile;
-		classid_mapping["CTFCannon"] = &CTFCannon;
-		classid_mapping["CTFGrenadeLauncher"] = &CTFGrenadeLauncher;
-		classid_mapping["CTFGrapplingHook"] = &CTFGrapplingHook;
-		classid_mapping["CTFFlareGun_Revenge"] = &CTFFlareGun_Revenge;
-		classid_mapping["CTFFlareGun"] = &CTFFlareGun;
-		classid_mapping["CTFFlameRocket"] = &CTFFlameRocket;
-		classid_mapping["CTFFlameThrower"] = &CTFFlameThrower;
-		classid_mapping["CTFFists"] = &CTFFists;
-		classid_mapping["CTFFireAxe"] = &CTFFireAxe;
-		classid_mapping["CTFCompoundBow"] = &CTFCompoundBow;
-		classid_mapping["CTFClub"] = &CTFClub;
-		classid_mapping["CTFBuffItem"] = &CTFBuffItem;
-		classid_mapping["CTFStickBomb"] = &CTFStickBomb;
-		classid_mapping["CTFBottle"] = &CTFBottle;
-		classid_mapping["CTFBonesaw"] = &CTFBonesaw;
-		classid_mapping["CTFBall_Ornament"] = &CTFBall_Ornament;
-		classid_mapping["CTFStunBall"] = &CTFStunBall;
-		classid_mapping["CTFBat_Giftwrap"] = &CTFBat_Giftwrap;
-		classid_mapping["CTFBat_Wood"] = &CTFBat_Wood;
-		classid_mapping["CTFBat_Fish"] = &CTFBat_Fish;
-		classid_mapping["CTFBat"] = &CTFBat;
-		classid_mapping["CTFBaseRocket"] = &CTFBaseRocket;
-		classid_mapping["CTFWeaponBaseMerasmusGrenade"] = &CTFWeaponBaseMerasmusGrenade;
-		classid_mapping["CTFWeaponBaseMelee"] = &CTFWeaponBaseMelee;
-		classid_mapping["CTFWeaponBaseGun"] = &CTFWeaponBaseGun;
-		classid_mapping["CTFWeaponBaseGrenadeProj"] = &CTFWeaponBaseGrenadeProj;
-		classid_mapping["CTFWeaponBase"] = &CTFWeaponBase;
-		classid_mapping["CTFViewModel"] = &CTFViewModel;
-		classid_mapping["CRobotDispenser"] = &CRobotDispenser;
-		classid_mapping["CTFRobotDestruction_Robot"] = &CTFRobotDestruction_Robot;
-		classid_mapping["CTFReviveMarker"] = &CTFReviveMarker;
-		classid_mapping["CTFPumpkinBomb"] = &CTFPumpkinBomb;
-		classid_mapping["CTFProjectile_EnergyRing"] = &CTFProjectile_EnergyRing;
-		classid_mapping["CTFBaseProjectile"] = &CTFBaseProjectile;
-		classid_mapping["CBaseObjectUpgrade"] = &CBaseObjectUpgrade;
-		classid_mapping["CMannVsMachineStats"] = &CMannVsMachineStats;
-		classid_mapping["CTFRobotDestructionLogic"] = &CTFRobotDestructionLogic;
-		classid_mapping["CTFRobotDestruction_RobotGroup"] = &CTFRobotDestruction_RobotGroup;
-		classid_mapping["CTFRobotDestruction_RobotSpawn"] = &CTFRobotDestruction_RobotSpawn;
-		classid_mapping["CTFPlayerDestructionLogic"] = &CTFPlayerDestructionLogic;
-		classid_mapping["CPlayerDestructionDispenser"] = &CPlayerDestructionDispenser;
-		classid_mapping["CTFMinigameLogic"] = &CTFMinigameLogic;
-		classid_mapping["CTFHalloweenMinigame_FallingPlatforms"] = &CTFHalloweenMinigame_FallingPlatforms;
-		classid_mapping["CTFHalloweenMinigame"] = &CTFHalloweenMinigame;
-		classid_mapping["CTFMiniGame"] = &CTFMiniGame;
-		classid_mapping["CTFWearableVM"] = &CTFWearableVM;
-		classid_mapping["CTFWearable"] = &CTFWearable;
-		classid_mapping["CTFPowerupBottle"] = &CTFPowerupBottle;
-		classid_mapping["CTFItem"] = &CTFItem;
-		classid_mapping["CHalloweenSoulPack"] = &CHalloweenSoulPack;
-		classid_mapping["CTFGenericBomb"] = &CTFGenericBomb;
-		classid_mapping["CBonusRoundLogic"] = &CBonusRoundLogic;
-		classid_mapping["CTFGameRulesProxy"] = &CTFGameRulesProxy;
-		classid_mapping["CTFDroppedWeapon"] = &CTFDroppedWeapon;
-		classid_mapping["CTFProjectile_SpellKartBats"] = &CTFProjectile_SpellKartBats;
-		classid_mapping["CTFProjectile_SpellKartOrb"] = &CTFProjectile_SpellKartOrb;
-		classid_mapping["CTFHellZap"] = &CTFHellZap;
-		classid_mapping["CTFProjectile_SpellLightningOrb"] = &CTFProjectile_SpellLightningOrb;
-		classid_mapping["CTFProjectile_SpellTransposeTeleport"] = &CTFProjectile_SpellTransposeTeleport;
-		classid_mapping["CTFProjectile_SpellMeteorShower"] = &CTFProjectile_SpellMeteorShower;
-		classid_mapping["CTFProjectile_SpellSpawnBoss"] = &CTFProjectile_SpellSpawnBoss;
-		classid_mapping["CTFProjectile_SpellMirv"] = &CTFProjectile_SpellMirv;
-		classid_mapping["CTFProjectile_SpellPumpkin"] = &CTFProjectile_SpellPumpkin;
-		classid_mapping["CTFProjectile_SpellSpawnHorde"] = &CTFProjectile_SpellSpawnHorde;
-		classid_mapping["CTFProjectile_SpellSpawnZombie"] = &CTFProjectile_SpellSpawnZombie;
-		classid_mapping["CTFProjectile_SpellBats"] = &CTFProjectile_SpellBats;
-		classid_mapping["CTFProjectile_SpellFireball"] = &CTFProjectile_SpellFireball;
-		classid_mapping["CTFSpellBook"] = &CTFSpellBook;
-		classid_mapping["CHightower_TeleportVortex"] = &CHightower_TeleportVortex;
-		classid_mapping["CTeleportVortex"] = &CTeleportVortex;
-		classid_mapping["CHalloweenGiftPickup"] = &CHalloweenGiftPickup;
-		classid_mapping["CBonusDuckPickup"] = &CBonusDuckPickup;
-		classid_mapping["CHalloweenPickup"] = &CHalloweenPickup;
-		classid_mapping["CCaptureFlagReturnIcon"] = &CCaptureFlagReturnIcon;
-		classid_mapping["CCaptureFlag"] = &CCaptureFlag;
-		classid_mapping["CBonusPack"] = &CBonusPack;
-		classid_mapping["CHandleTest"] = &CHandleTest;
-		classid_mapping["CTeamRoundTimer"] = &CTeamRoundTimer;
-		classid_mapping["CTeamplayRoundBasedRulesProxy"] = &CTeamplayRoundBasedRulesProxy;
-		classid_mapping["CSpriteTrail"] = &CSpriteTrail;
-		classid_mapping["CSpriteOriented"] = &CSpriteOriented;
-		classid_mapping["CSprite"] = &CSprite;
-		classid_mapping["CPoseController"] = &CPoseController;
-		classid_mapping["CGameRulesProxy"] = &CGameRulesProxy;
-		classid_mapping["CInfoLadderDismount"] = &CInfoLadderDismount;
-		classid_mapping["CFuncLadder"] = &CFuncLadder;
-		classid_mapping["CEnvDetailController"] = &CEnvDetailController;
-		classid_mapping["CTFWearableItem"] = &CTFWearableItem;
-		classid_mapping["CEconWearable"] = &CEconWearable;
-		classid_mapping["CBaseAttributableItem"] = &CBaseAttributableItem;
-		classid_mapping["CEconEntity"] = &CEconEntity;
-		classid_mapping["CBeam"] = &CBeam;
-		classid_mapping["CBaseViewModel"] = &CBaseViewModel;
-		classid_mapping["CBaseProjectile"] = &CBaseProjectile;
-		classid_mapping["CBaseParticleEntity"] = &CBaseParticleEntity;
-		classid_mapping["CBaseGrenade"] = &CBaseGrenade;
-		classid_mapping["CBaseCombatWeapon"] = &CBaseCombatWeapon;
-		classid_mapping["CVoteController"] = &CVoteController;
-		classid_mapping["CTEHL2MPFireBullets"] = &CTEHL2MPFireBullets;
-		classid_mapping["CHL2MPRagdoll"] = &CHL2MPRagdoll;
-		classid_mapping["CHL2MP_Player"] = &CHL2MP_Player;
-		classid_mapping["CWeaponCitizenSuitcase"] = &CWeaponCitizenSuitcase;
-		classid_mapping["CWeaponCitizenPackage"] = &CWeaponCitizenPackage;
-		classid_mapping["CWeaponAlyxGun"] = &CWeaponAlyxGun;
-		classid_mapping["CWeaponCubemap"] = &CWeaponCubemap;
-		classid_mapping["CWeaponGaussGun"] = &CWeaponGaussGun;
-		classid_mapping["CWeaponAnnabelle"] = &CWeaponAnnabelle;
-		classid_mapping["CFlaregun"] = &CFlaregun;
-		classid_mapping["CWeaponBugBait"] = &CWeaponBugBait;
-		classid_mapping["CWeaponBinoculars"] = &CWeaponBinoculars;
-		classid_mapping["CWeaponCycler"] = &CWeaponCycler;
-		classid_mapping["CCrossbowBolt"] = &CCrossbowBolt;
-		classid_mapping["CPropVehiclePrisonerPod"] = &CPropVehiclePrisonerPod;
-		classid_mapping["CPropCrane"] = &CPropCrane;
-		classid_mapping["CPropCannon"] = &CPropCannon;
-		classid_mapping["CPropAirboat"] = &CPropAirboat;
-		classid_mapping["CFlare"] = &CFlare;
-		classid_mapping["CTEConcussiveExplosion"] = &CTEConcussiveExplosion;
-		classid_mapping["CNPC_Strider"] = &CNPC_Strider;
-		classid_mapping["CScriptIntro"] = &CScriptIntro;
-		classid_mapping["CRotorWashEmitter"] = &CRotorWashEmitter;
-		classid_mapping["CPropCombineBall"] = &CPropCombineBall;
-		classid_mapping["CPlasmaBeamNode"] = &CPlasmaBeamNode;
-		classid_mapping["CNPC_RollerMine"] = &CNPC_RollerMine;
-		classid_mapping["CNPC_Manhack"] = &CNPC_Manhack;
-		classid_mapping["CNPC_CombineGunship"] = &CNPC_CombineGunship;
-		classid_mapping["CNPC_AntlionGuard"] = &CNPC_AntlionGuard;
-		classid_mapping["CInfoTeleporterCountdown"] = &CInfoTeleporterCountdown;
-		classid_mapping["CMortarShell"] = &CMortarShell;
-		classid_mapping["CEnvStarfield"] = &CEnvStarfield;
-		classid_mapping["CEnvHeadcrabCanister"] = &CEnvHeadcrabCanister;
-		classid_mapping["CAlyxEmpEffect"] = &CAlyxEmpEffect;
-		classid_mapping["CCorpse"] = &CCorpse;
-		classid_mapping["CCitadelEnergyCore"] = &CCitadelEnergyCore;
-		classid_mapping["CHL2_Player"] = &CHL2_Player;
-		classid_mapping["CBaseHLBludgeonWeapon"] = &CBaseHLBludgeonWeapon;
-		classid_mapping["CHLSelectFireMachineGun"] = &CHLSelectFireMachineGun;
-		classid_mapping["CHLMachineGun"] = &CHLMachineGun;
-		classid_mapping["CBaseHelicopter"] = &CBaseHelicopter;
-		classid_mapping["CNPC_Barney"] = &CNPC_Barney;
-		classid_mapping["CNPC_Barnacle"] = &CNPC_Barnacle;
-		classid_mapping["AR2Explosion"] = &AR2Explosion;
-		classid_mapping["CTEAntlionDust"] = &CTEAntlionDust;
-		classid_mapping["CVortigauntEffectDispel"] = &CVortigauntEffectDispel;
-		classid_mapping["CVortigauntChargeToken"] = &CVortigauntChargeToken;
-		classid_mapping["CNPC_Vortigaunt"] = &CNPC_Vortigaunt;
-		classid_mapping["CPredictedViewModel"] = &CPredictedViewModel;
-		classid_mapping["CWeaponStunStick"] = &CWeaponStunStick;
-		classid_mapping["CWeaponSMG1"] = &CWeaponSMG1;
-		classid_mapping["CWeapon_SLAM"] = &CWeapon_SLAM;
-		classid_mapping["CWeaponShotgun"] = &CWeaponShotgun;
-		classid_mapping["CWeaponRPG"] = &CWeaponRPG;
-		classid_mapping["CWeaponPistol"] = &CWeaponPistol;
-		classid_mapping["CWeaponPhysCannon"] = &CWeaponPhysCannon;
-		classid_mapping["CHL2MPMachineGun"] = &CHL2MPMachineGun;
-		classid_mapping["CBaseHL2MPCombatWeapon"] = &CBaseHL2MPCombatWeapon;
-		classid_mapping["CBaseHL2MPBludgeonWeapon"] = &CBaseHL2MPBludgeonWeapon;
-		classid_mapping["CWeaponHL2MPBase"] = &CWeaponHL2MPBase;
-		classid_mapping["CWeaponFrag"] = &CWeaponFrag;
-		classid_mapping["CWeaponCrowbar"] = &CWeaponCrowbar;
-		classid_mapping["CWeaponCrossbow"] = &CWeaponCrossbow;
-		classid_mapping["CWeaponAR2"] = &CWeaponAR2;
-		classid_mapping["CWeapon357"] = &CWeapon357;
-		classid_mapping["CHL2MPGameRulesProxy"] = &CHL2MPGameRulesProxy;
-		classid_mapping["CHalfLife2Proxy"] = &CHalfLife2Proxy;
-		classid_mapping["CBaseHLCombatWeapon"] = &CBaseHLCombatWeapon;
-		classid_mapping["CTFVehicle"] = &CTFVehicle;
-		classid_mapping["CTFBaseDMPowerup"] = &CTFBaseDMPowerup;
-		classid_mapping["CWeaponSpawner"] = &CWeaponSpawner;
-		classid_mapping["CTFUmbrella"] = &CTFUmbrella;
-		classid_mapping["CTFTranq"] = &CTFTranq;
-		classid_mapping["CTFSMG_Primary"] = &CTFSMG_Primary;
-		classid_mapping["CTFRevolver_Secondary"] = &CTFRevolver_Secondary;
-		classid_mapping["CTFNailgun"] = &CTFNailgun;
-		classid_mapping["CTFHunterRifle"] = &CTFHunterRifle;
-		classid_mapping["CTFHeavyArtillery"] = &CTFHeavyArtillery;
-		classid_mapping["CTFHammerfists"] = &CTFHammerfists;
-		classid_mapping["CTFCrowbar"] = &CTFCrowbar;
-		classid_mapping["CTFChainsaw"] = &CTFChainsaw;
-		classid_mapping["CTEPlantBomb"] = &CTEPlantBomb;
-		classid_mapping["CTERadioIcon"] = &CTERadioIcon;
-		classid_mapping["CPlantedC4"] = &CPlantedC4;
-		classid_mapping["CCSTeam"] = &CCSTeam;
-		classid_mapping["CCSPlayerResource"] = &CCSPlayerResource;
-		classid_mapping["CCSPlayer"] = &CCSPlayer;
-		classid_mapping["CCSRagdoll"] = &CCSRagdoll;
-		classid_mapping["CHostage"] = &CHostage;
-		classid_mapping["CWeaponXM1014"] = &CWeaponXM1014;
-		classid_mapping["CWeaponUSP"] = &CWeaponUSP;
-		classid_mapping["CWeaponUMP45"] = &CWeaponUMP45;
-		classid_mapping["CWeaponTMP"] = &CWeaponTMP;
-		classid_mapping["CSmokeGrenade"] = &CSmokeGrenade;
-		classid_mapping["CWeaponSG552"] = &CWeaponSG552;
-		classid_mapping["CWeaponSG550"] = &CWeaponSG550;
-		classid_mapping["CWeaponScout"] = &CWeaponScout;
-		classid_mapping["CWeaponP90"] = &CWeaponP90;
-		classid_mapping["CWeaponP228"] = &CWeaponP228;
-		classid_mapping["CWeaponMP5Navy"] = &CWeaponMP5Navy;
-		classid_mapping["CWeaponMAC10"] = &CWeaponMAC10;
-		classid_mapping["CWeaponM4A1"] = &CWeaponM4A1;
-		classid_mapping["CWeaponM3"] = &CWeaponM3;
-		classid_mapping["CWeaponM249"] = &CWeaponM249;
-		classid_mapping["CKnife"] = &CKnife;
-		classid_mapping["CHEGrenade"] = &CHEGrenade;
-		classid_mapping["CWeaponGlock"] = &CWeaponGlock;
-		classid_mapping["CWeaponGalil"] = &CWeaponGalil;
-		classid_mapping["CWeaponG3SG1"] = &CWeaponG3SG1;
-		classid_mapping["CFlashbang"] = &CFlashbang;
-		classid_mapping["CWeaponFiveSeven"] = &CWeaponFiveSeven;
-		classid_mapping["CWeaponFamas"] = &CWeaponFamas;
-		classid_mapping["CWeaponElite"] = &CWeaponElite;
-		classid_mapping["CDEagle"] = &CDEagle;
-		classid_mapping["CWeaponCSBaseGun"] = &CWeaponCSBaseGun;
-		classid_mapping["CWeaponCSBase"] = &CWeaponCSBase;
-		classid_mapping["CC4"] = &CC4;
-		classid_mapping["CBaseCSGrenade"] = &CBaseCSGrenade;
-		classid_mapping["CWeaponAWP"] = &CWeaponAWP;
-		classid_mapping["CWeaponAug"] = &CWeaponAug;
-		classid_mapping["CAK47"] = &CAK47;
-		classid_mapping["CFootstepControl"] = &CFootstepControl;
-		classid_mapping["CCSGameRulesProxy"] = &CCSGameRulesProxy;
-		classid_mapping["CBaseCSGrenadeProjectile"] = &CBaseCSGrenadeProjectile;
-		classid_mapping["CSDKTeam_Deathmatch"] = &CSDKTeam_Deathmatch;
-		classid_mapping["CSDKTeam_Red"] = &CSDKTeam_Red;
-		classid_mapping["CSDKTeam_Blue"] = &CSDKTeam_Blue;
-		classid_mapping["CSDKTeam_Unassigned"] = &CSDKTeam_Unassigned;
-		classid_mapping["CSDKTeam"] = &CSDKTeam;
-		classid_mapping["CSDKPlayerResource"] = &CSDKPlayerResource;
-		classid_mapping["CSDKRagdoll"] = &CSDKRagdoll;
-		classid_mapping["CSDKPlayer"] = &CSDKPlayer;
-		classid_mapping["CSparkler"] = &CSparkler;
-		classid_mapping["CRatRaceWaypoint"] = &CRatRaceWaypoint;
-		classid_mapping["CBriefcaseCaptureZone"] = &CBriefcaseCaptureZone;
-		classid_mapping["CBriefcase"] = &CBriefcase;
-		classid_mapping["CWeaponSDKBase"] = &CWeaponSDKBase;
-		classid_mapping["CWeaponMP5K"] = &CWeaponMP5K;
-		classid_mapping["CWeaponMossberg"] = &CWeaponMossberg;
-		classid_mapping["CWeaponM1911"] = &CWeaponM1911;
-		classid_mapping["CWeaponM16"] = &CWeaponM16;
-		classid_mapping["CWeaponGrenade"] = &CWeaponGrenade;
-		classid_mapping["CWeaponFAL"] = &CWeaponFAL;
-		classid_mapping["CWeaponBrawl"] = &CWeaponBrawl;
-		classid_mapping["CWeaponBeretta"] = &CWeaponBeretta;
-		classid_mapping["CBaseSDKGrenade"] = &CBaseSDKGrenade;
-		classid_mapping["CAkimboM1911"] = &CAkimboM1911;
-		classid_mapping["CAkimboBeretta"] = &CAkimboBeretta;
-		classid_mapping["CAkimboBase"] = &CAkimboBase;
-		classid_mapping["CWeaponSDKMelee"] = &CWeaponSDKMelee;
-		classid_mapping["CSDKGameRulesProxy"] = &CSDKGameRulesProxy;
-		classid_mapping["CBaseGrenadeProjectile"] = &CBaseGrenadeProjectile;
-		classid_mapping["CDAViewModel"] = &CDAViewModel;
-		classid_mapping["CTFWearableRazorback"] = &CTFWearableRazorback;
-		classid_mapping["CTFWearableCampaignItem"] = &CTFWearableCampaignItem;
-		classid_mapping["CTFSlap"] = &CTFSlap;
-		classid_mapping["CTFRocketPack"] = &CTFRocketPack;
-		classid_mapping["CTFGasManager"] = &CTFGasManager;
-		classid_mapping["CTFProjectile_JarGas"] = &CTFProjectile_JarGas;
-		classid_mapping["CTFJarGas"] = &CTFJarGas;
-		classid_mapping["CTFWeaponFlameBall"] = &CTFWeaponFlameBall;
-		classid_mapping["CTFBreakableSign"] = &CTFBreakableSign;
-		classid_mapping["CTFBreakableMelee"] = &CTFBreakableMelee;
-		classid_mapping["CTFProjectile_BallOfFire"] = &CTFProjectile_BallOfFire;
-		classid_mapping["CTFPointManager"] = &CTFPointManager;
-		classid_mapping["CTFFlameManager"] = &CTFFlameManager;
+namespace client_classes
+{
 
+std::unordered_map<std::string, int *> classid_mapping{};
+
+dynamic::dynamic()
+{
+    classid_mapping["CTETFParticleEffect"]      = &CTETFParticleEffect;
+    classid_mapping["CTETFExplosion"]           = &CTETFExplosion;
+    classid_mapping["CTETFBlood"]               = &CTETFBlood;
+    classid_mapping["CTFTankBoss"]              = &CTFTankBoss;
+    classid_mapping["CTFBaseBoss"]              = &CTFBaseBoss;
+    classid_mapping["CBossAlpha"]               = &CBossAlpha;
+    classid_mapping["CZombie"]                  = &CZombie;
+    classid_mapping["CMerasmusDancer"]          = &CMerasmusDancer;
+    classid_mapping["CMerasmus"]                = &CMerasmus;
+    classid_mapping["CHeadlessHatman"]          = &CHeadlessHatman;
+    classid_mapping["CEyeballBoss"]             = &CEyeballBoss;
+    classid_mapping["CTFWeaponSapper"]          = &CTFWeaponSapper;
+    classid_mapping["CTFWeaponBuilder"]         = &CTFWeaponBuilder;
+    classid_mapping["C_TFWeaponBuilder"]        = &C_TFWeaponBuilder;
+    classid_mapping["CTFTeam"]                  = &CTFTeam;
+    classid_mapping["CTFTauntProp"]             = &CTFTauntProp;
+    classid_mapping["CTFProjectile_Rocket"]     = &CTFProjectile_Rocket;
+    classid_mapping["CTFProjectile_Flare"]      = &CTFProjectile_Flare;
+    classid_mapping["CTFProjectile_EnergyBall"] = &CTFProjectile_EnergyBall;
+    classid_mapping["CTFProjectile_GrapplingHook"] =
+        &CTFProjectile_GrapplingHook;
+    classid_mapping["CTFProjectile_HealingBolt"]  = &CTFProjectile_HealingBolt;
+    classid_mapping["CTFProjectile_Arrow"]        = &CTFProjectile_Arrow;
+    classid_mapping["CTFPlayerResource"]          = &CTFPlayerResource;
+    classid_mapping["CTFPlayer"]                  = &CTFPlayer;
+    classid_mapping["CTFRagdoll"]                 = &CTFRagdoll;
+    classid_mapping["CTEPlayerAnimEvent"]         = &CTEPlayerAnimEvent;
+    classid_mapping["CTFPasstimeLogic"]           = &CTFPasstimeLogic;
+    classid_mapping["CPasstimeBall"]              = &CPasstimeBall;
+    classid_mapping["CTFObjectiveResource"]       = &CTFObjectiveResource;
+    classid_mapping["CTFGlow"]                    = &CTFGlow;
+    classid_mapping["CTEFireBullets"]             = &CTEFireBullets;
+    classid_mapping["CTFBuffBanner"]              = &CTFBuffBanner;
+    classid_mapping["CTFAmmoPack"]                = &CTFAmmoPack;
+    classid_mapping["CObjectTeleporter"]          = &CObjectTeleporter;
+    classid_mapping["CObjectSentrygun"]           = &CObjectSentrygun;
+    classid_mapping["CTFProjectile_SentryRocket"] = &CTFProjectile_SentryRocket;
+    classid_mapping["CObjectSapper"]              = &CObjectSapper;
+    classid_mapping["CObjectCartDispenser"]       = &CObjectCartDispenser;
+    classid_mapping["CObjectDispenser"]           = &CObjectDispenser;
+    classid_mapping["CMonsterResource"]           = &CMonsterResource;
+    classid_mapping["CFuncRespawnRoomVisualizer"] = &CFuncRespawnRoomVisualizer;
+    classid_mapping["CFuncRespawnRoom"]           = &CFuncRespawnRoom;
+    classid_mapping["CFuncPasstimeGoal"]          = &CFuncPasstimeGoal;
+    classid_mapping["CFuncForceField"]            = &CFuncForceField;
+    classid_mapping["CCaptureZone"]               = &CCaptureZone;
+    classid_mapping["CCurrencyPack"]              = &CCurrencyPack;
+    classid_mapping["CBaseObject"]                = &CBaseObject;
+    classid_mapping["CTFBotHintEngineerNest"]     = &CTFBotHintEngineerNest;
+    classid_mapping["CBotNPCMinion"]              = &CBotNPCMinion;
+    classid_mapping["CBotNPC"]                    = &CBotNPC;
+    classid_mapping["CRagdollPropAttached"]       = &CRagdollPropAttached;
+    classid_mapping["CRagdollProp"]               = &CRagdollProp;
+    classid_mapping["NextBotCombatCharacter"]     = &NextBotCombatCharacter;
+    classid_mapping["CWaterBullet"]               = &CWaterBullet;
+    classid_mapping["CFuncMonitor"]               = &CFuncMonitor;
+    classid_mapping["CWorld"]                     = &CWorld;
+    classid_mapping["CWaterLODControl"]           = &CWaterLODControl;
+    classid_mapping["CVGuiScreen"]                = &CVGuiScreen;
+    classid_mapping["CPropJeep"]                  = &CPropJeep;
+    classid_mapping["CPropVehicleChoreoGeneric"]  = &CPropVehicleChoreoGeneric;
+    classid_mapping["CTEWorldDecal"]              = &CTEWorldDecal;
+    classid_mapping["CTESpriteSpray"]             = &CTESpriteSpray;
+    classid_mapping["CTESprite"]                  = &CTESprite;
+    classid_mapping["CTESparks"]                  = &CTESparks;
+    classid_mapping["CTESmoke"]                   = &CTESmoke;
+    classid_mapping["CTEShowLine"]                = &CTEShowLine;
+    classid_mapping["CTEProjectedDecal"]          = &CTEProjectedDecal;
+    classid_mapping["CTEPlayerDecal"]             = &CTEPlayerDecal;
+    classid_mapping["CTEPhysicsProp"]             = &CTEPhysicsProp;
+    classid_mapping["CTEParticleSystem"]          = &CTEParticleSystem;
+    classid_mapping["CTEMuzzleFlash"]             = &CTEMuzzleFlash;
+    classid_mapping["CTELargeFunnel"]             = &CTELargeFunnel;
+    classid_mapping["CTEKillPlayerAttachments"]   = &CTEKillPlayerAttachments;
+    classid_mapping["CTEImpact"]                  = &CTEImpact;
+    classid_mapping["CTEGlowSprite"]              = &CTEGlowSprite;
+    classid_mapping["CTEShatterSurface"]          = &CTEShatterSurface;
+    classid_mapping["CTEFootprintDecal"]          = &CTEFootprintDecal;
+    classid_mapping["CTEFizz"]                    = &CTEFizz;
+    classid_mapping["CTEExplosion"]               = &CTEExplosion;
+    classid_mapping["CTEEnergySplash"]            = &CTEEnergySplash;
+    classid_mapping["CTEEffectDispatch"]          = &CTEEffectDispatch;
+    classid_mapping["CTEDynamicLight"]            = &CTEDynamicLight;
+    classid_mapping["CTEDecal"]                   = &CTEDecal;
+    classid_mapping["CTEClientProjectile"]        = &CTEClientProjectile;
+    classid_mapping["CTEBubbleTrail"]             = &CTEBubbleTrail;
+    classid_mapping["CTEBubbles"]                 = &CTEBubbles;
+    classid_mapping["CTEBSPDecal"]                = &CTEBSPDecal;
+    classid_mapping["CTEBreakModel"]              = &CTEBreakModel;
+    classid_mapping["CTEBloodStream"]             = &CTEBloodStream;
+    classid_mapping["CTEBloodSprite"]             = &CTEBloodSprite;
+    classid_mapping["CTEBeamSpline"]              = &CTEBeamSpline;
+    classid_mapping["CTEBeamRingPoint"]           = &CTEBeamRingPoint;
+    classid_mapping["CTEBeamRing"]                = &CTEBeamRing;
+    classid_mapping["CTEBeamPoints"]              = &CTEBeamPoints;
+    classid_mapping["CTEBeamLaser"]               = &CTEBeamLaser;
+    classid_mapping["CTEBeamFollow"]              = &CTEBeamFollow;
+    classid_mapping["CTEBeamEnts"]                = &CTEBeamEnts;
+    classid_mapping["CTEBeamEntPoint"]            = &CTEBeamEntPoint;
+    classid_mapping["CTEBaseBeam"]                = &CTEBaseBeam;
+    classid_mapping["CTEArmorRicochet"]           = &CTEArmorRicochet;
+    classid_mapping["CTEMetalSparks"]             = &CTEMetalSparks;
+    classid_mapping["CTest_ProxyToggle_Networkable"] =
+        &CTest_ProxyToggle_Networkable;
+    classid_mapping["CTestTraceline"]             = &CTestTraceline;
+    classid_mapping["CTesla"]                     = &CTesla;
+    classid_mapping["CTeamTrainWatcher"]          = &CTeamTrainWatcher;
+    classid_mapping["CBaseTeamObjectiveResource"] = &CBaseTeamObjectiveResource;
+    classid_mapping["CTeam"]                      = &CTeam;
+    classid_mapping["CSun"]                       = &CSun;
+    classid_mapping["CSteamJet"]                  = &CSteamJet;
+    classid_mapping["CParticlePerformanceMonitor"] =
+        &CParticlePerformanceMonitor;
+    classid_mapping["CSpotlightEnd"]            = &CSpotlightEnd;
+    classid_mapping["DustTrail"]                = &DustTrail;
+    classid_mapping["CFireTrail"]               = &CFireTrail;
+    classid_mapping["SporeTrail"]               = &SporeTrail;
+    classid_mapping["SporeExplosion"]           = &SporeExplosion;
+    classid_mapping["RocketTrail"]              = &RocketTrail;
+    classid_mapping["SmokeTrail"]               = &SmokeTrail;
+    classid_mapping["CSmokeStack"]              = &CSmokeStack;
+    classid_mapping["CSlideshowDisplay"]        = &CSlideshowDisplay;
+    classid_mapping["CShadowControl"]           = &CShadowControl;
+    classid_mapping["CSceneEntity"]             = &CSceneEntity;
+    classid_mapping["CRopeKeyframe"]            = &CRopeKeyframe;
+    classid_mapping["CRagdollManager"]          = &CRagdollManager;
+    classid_mapping["CPropVehicleDriveable"]    = &CPropVehicleDriveable;
+    classid_mapping["CPhysicsPropMultiplayer"]  = &CPhysicsPropMultiplayer;
+    classid_mapping["CPhysBoxMultiplayer"]      = &CPhysBoxMultiplayer;
+    classid_mapping["CBasePropDoor"]            = &CBasePropDoor;
+    classid_mapping["CDynamicProp"]             = &CDynamicProp;
+    classid_mapping["CPointCommentaryNode"]     = &CPointCommentaryNode;
+    classid_mapping["CPointCamera"]             = &CPointCamera;
+    classid_mapping["CPlayerResource"]          = &CPlayerResource;
+    classid_mapping["CPlasma"]                  = &CPlasma;
+    classid_mapping["CPhysMagnet"]              = &CPhysMagnet;
+    classid_mapping["CPhysicsProp"]             = &CPhysicsProp;
+    classid_mapping["CPhysBox"]                 = &CPhysBox;
+    classid_mapping["CParticleSystem"]          = &CParticleSystem;
+    classid_mapping["ParticleSmokeGrenade"]     = &ParticleSmokeGrenade;
+    classid_mapping["CParticleFire"]            = &CParticleFire;
+    classid_mapping["MovieExplosion"]           = &MovieExplosion;
+    classid_mapping["CMaterialModifyControl"]   = &CMaterialModifyControl;
+    classid_mapping["CLightGlow"]               = &CLightGlow;
+    classid_mapping["CInfoOverlayAccessor"]     = &CInfoOverlayAccessor;
+    classid_mapping["CTEGaussExplosion"]        = &CTEGaussExplosion;
+    classid_mapping["CFuncTrackTrain"]          = &CFuncTrackTrain;
+    classid_mapping["CFuncSmokeVolume"]         = &CFuncSmokeVolume;
+    classid_mapping["CFuncRotating"]            = &CFuncRotating;
+    classid_mapping["CFuncReflectiveGlass"]     = &CFuncReflectiveGlass;
+    classid_mapping["CFuncOccluder"]            = &CFuncOccluder;
+    classid_mapping["CFunc_LOD"]                = &CFunc_LOD;
+    classid_mapping["CTEDust"]                  = &CTEDust;
+    classid_mapping["CFunc_Dust"]               = &CFunc_Dust;
+    classid_mapping["CFuncConveyor"]            = &CFuncConveyor;
+    classid_mapping["CBreakableSurface"]        = &CBreakableSurface;
+    classid_mapping["CFuncAreaPortalWindow"]    = &CFuncAreaPortalWindow;
+    classid_mapping["CFish"]                    = &CFish;
+    classid_mapping["CEntityFlame"]             = &CEntityFlame;
+    classid_mapping["CFireSmoke"]               = &CFireSmoke;
+    classid_mapping["CEnvTonemapController"]    = &CEnvTonemapController;
+    classid_mapping["CEnvScreenEffect"]         = &CEnvScreenEffect;
+    classid_mapping["CEnvScreenOverlay"]        = &CEnvScreenOverlay;
+    classid_mapping["CEnvProjectedTexture"]     = &CEnvProjectedTexture;
+    classid_mapping["CEnvParticleScript"]       = &CEnvParticleScript;
+    classid_mapping["CFogController"]           = &CFogController;
+    classid_mapping["CEntityParticleTrail"]     = &CEntityParticleTrail;
+    classid_mapping["CEntityDissolve"]          = &CEntityDissolve;
+    classid_mapping["CEnvQuadraticBeam"]        = &CEnvQuadraticBeam;
+    classid_mapping["CEmbers"]                  = &CEmbers;
+    classid_mapping["CEnvWind"]                 = &CEnvWind;
+    classid_mapping["CPrecipitation"]           = &CPrecipitation;
+    classid_mapping["CDynamicLight"]            = &CDynamicLight;
+    classid_mapping["CColorCorrectionVolume"]   = &CColorCorrectionVolume;
+    classid_mapping["CColorCorrection"]         = &CColorCorrection;
+    classid_mapping["CBreakableProp"]           = &CBreakableProp;
+    classid_mapping["CBaseTempEntity"]          = &CBaseTempEntity;
+    classid_mapping["CBasePlayer"]              = &CBasePlayer;
+    classid_mapping["CBaseFlex"]                = &CBaseFlex;
+    classid_mapping["CBaseEntity"]              = &CBaseEntity;
+    classid_mapping["CBaseDoor"]                = &CBaseDoor;
+    classid_mapping["CBaseCombatCharacter"]     = &CBaseCombatCharacter;
+    classid_mapping["CBaseAnimatingOverlay"]    = &CBaseAnimatingOverlay;
+    classid_mapping["CBoneFollower"]            = &CBoneFollower;
+    classid_mapping["CBaseAnimating"]           = &CBaseAnimating;
+    classid_mapping["CInfoLightingRelative"]    = &CInfoLightingRelative;
+    classid_mapping["CAI_BaseNPC"]              = &CAI_BaseNPC;
+    classid_mapping["CWeaponIFMSteadyCam"]      = &CWeaponIFMSteadyCam;
+    classid_mapping["CWeaponIFMBaseCamera"]     = &CWeaponIFMBaseCamera;
+    classid_mapping["CWeaponIFMBase"]           = &CWeaponIFMBase;
+    classid_mapping["CTFWearableLevelableItem"] = &CTFWearableLevelableItem;
+    classid_mapping["CTFWearableDemoShield"]    = &CTFWearableDemoShield;
+    classid_mapping["CTFWearableRobotArm"]      = &CTFWearableRobotArm;
+    classid_mapping["CTFRobotArm"]              = &CTFRobotArm;
+    classid_mapping["CTFWrench"]                = &CTFWrench;
+    classid_mapping["CTFProjectile_ThrowableBreadMonster"] =
+        &CTFProjectile_ThrowableBreadMonster;
+    classid_mapping["CTFProjectile_ThrowableBrick"] =
+        &CTFProjectile_ThrowableBrick;
+    classid_mapping["CTFProjectile_ThrowableRepel"] =
+        &CTFProjectile_ThrowableRepel;
+    classid_mapping["CTFProjectile_Throwable"]  = &CTFProjectile_Throwable;
+    classid_mapping["CTFThrowable"]             = &CTFThrowable;
+    classid_mapping["CTFSyringeGun"]            = &CTFSyringeGun;
+    classid_mapping["CTFKatana"]                = &CTFKatana;
+    classid_mapping["CTFSword"]                 = &CTFSword;
+    classid_mapping["CSniperDot"]               = &CSniperDot;
+    classid_mapping["CTFSniperRifleClassic"]    = &CTFSniperRifleClassic;
+    classid_mapping["CTFSniperRifleDecap"]      = &CTFSniperRifleDecap;
+    classid_mapping["CTFSniperRifle"]           = &CTFSniperRifle;
+    classid_mapping["CTFChargedSMG"]            = &CTFChargedSMG;
+    classid_mapping["CTFSMG"]                   = &CTFSMG;
+    classid_mapping["CTFShovel"]                = &CTFShovel;
+    classid_mapping["CTFShotgunBuildingRescue"] = &CTFShotgunBuildingRescue;
+    classid_mapping["CTFPEPBrawlerBlaster"]     = &CTFPEPBrawlerBlaster;
+    classid_mapping["CTFSodaPopper"]            = &CTFSodaPopper;
+    classid_mapping["CTFShotgun_Revenge"]       = &CTFShotgun_Revenge;
+    classid_mapping["CTFScatterGun"]            = &CTFScatterGun;
+    classid_mapping["CTFShotgun_Pyro"]          = &CTFShotgun_Pyro;
+    classid_mapping["CTFShotgun_HWG"]           = &CTFShotgun_HWG;
+    classid_mapping["CTFShotgun_Soldier"]       = &CTFShotgun_Soldier;
+    classid_mapping["CTFShotgun"]               = &CTFShotgun;
+    classid_mapping["CTFCrossbow"]              = &CTFCrossbow;
+    classid_mapping["CTFRocketLauncher_Mortar"] = &CTFRocketLauncher_Mortar;
+    classid_mapping["CTFRocketLauncher_AirStrike"] =
+        &CTFRocketLauncher_AirStrike;
+    classid_mapping["CTFRocketLauncher_DirectHit"] =
+        &CTFRocketLauncher_DirectHit;
+    classid_mapping["CTFRocketLauncher"]        = &CTFRocketLauncher;
+    classid_mapping["CTFRevolver"]              = &CTFRevolver;
+    classid_mapping["CTFDRGPomson"]             = &CTFDRGPomson;
+    classid_mapping["CTFRaygun"]                = &CTFRaygun;
+    classid_mapping["CTFPistol_ScoutSecondary"] = &CTFPistol_ScoutSecondary;
+    classid_mapping["CTFPistol_ScoutPrimary"]   = &CTFPistol_ScoutPrimary;
+    classid_mapping["CTFPistol_Scout"]          = &CTFPistol_Scout;
+    classid_mapping["CTFPistol"]                = &CTFPistol;
+    classid_mapping["CTFPipebombLauncher"]      = &CTFPipebombLauncher;
+    classid_mapping["CTFWeaponPDA_Spy"]         = &CTFWeaponPDA_Spy;
+    classid_mapping["CTFWeaponPDA_Engineer_Destroy"] =
+        &CTFWeaponPDA_Engineer_Destroy;
+    classid_mapping["CTFWeaponPDA_Engineer_Build"] =
+        &CTFWeaponPDA_Engineer_Build;
+    classid_mapping["CTFWeaponPDAExpansion_Teleporter"] =
+        &CTFWeaponPDAExpansion_Teleporter;
+    classid_mapping["CTFWeaponPDAExpansion_Dispenser"] =
+        &CTFWeaponPDAExpansion_Dispenser;
+    classid_mapping["CTFWeaponPDA"]           = &CTFWeaponPDA;
+    classid_mapping["CPasstimeGun"]           = &CPasstimeGun;
+    classid_mapping["CTFParticleCannon"]      = &CTFParticleCannon;
+    classid_mapping["CTFParachute_Secondary"] = &CTFParachute_Secondary;
+    classid_mapping["CTFParachute_Primary"]   = &CTFParachute_Primary;
+    classid_mapping["CTFParachute"]           = &CTFParachute;
+    classid_mapping["CTFMinigun"]             = &CTFMinigun;
+    classid_mapping["CTFMedigunShield"]       = &CTFMedigunShield;
+    classid_mapping["CWeaponMedigun"]         = &CWeaponMedigun;
+    classid_mapping["CTFMechanicalArm"]       = &CTFMechanicalArm;
+    classid_mapping["CTFLunchBox_Drink"]      = &CTFLunchBox_Drink;
+    classid_mapping["CTFLunchBox"]            = &CTFLunchBox;
+    classid_mapping["CLaserDot"]              = &CLaserDot;
+    classid_mapping["CTFLaserPointer"]        = &CTFLaserPointer;
+    classid_mapping["CTFKnife"]               = &CTFKnife;
+    classid_mapping["CTFProjectile_Cleaver"]  = &CTFProjectile_Cleaver;
+    classid_mapping["CTFProjectile_JarMilk"]  = &CTFProjectile_JarMilk;
+    classid_mapping["CTFProjectile_Jar"]      = &CTFProjectile_Jar;
+    classid_mapping["CTFCleaver"]             = &CTFCleaver;
+    classid_mapping["CTFJarMilk"]             = &CTFJarMilk;
+    classid_mapping["CTFJar"]                 = &CTFJar;
+    classid_mapping["CTFWeaponInvis"]         = &CTFWeaponInvis;
+    classid_mapping["CTFGrenadePipebombProjectile"] =
+        &CTFGrenadePipebombProjectile;
+    classid_mapping["CTFCannon"]           = &CTFCannon;
+    classid_mapping["CTFGrenadeLauncher"]  = &CTFGrenadeLauncher;
+    classid_mapping["CTFGrapplingHook"]    = &CTFGrapplingHook;
+    classid_mapping["CTFFlareGun_Revenge"] = &CTFFlareGun_Revenge;
+    classid_mapping["CTFFlareGun"]         = &CTFFlareGun;
+    classid_mapping["CTFFlameRocket"]      = &CTFFlameRocket;
+    classid_mapping["CTFFlameThrower"]     = &CTFFlameThrower;
+    classid_mapping["CTFFists"]            = &CTFFists;
+    classid_mapping["CTFFireAxe"]          = &CTFFireAxe;
+    classid_mapping["CTFCompoundBow"]      = &CTFCompoundBow;
+    classid_mapping["CTFClub"]             = &CTFClub;
+    classid_mapping["CTFBuffItem"]         = &CTFBuffItem;
+    classid_mapping["CTFStickBomb"]        = &CTFStickBomb;
+    classid_mapping["CTFBottle"]           = &CTFBottle;
+    classid_mapping["CTFBonesaw"]          = &CTFBonesaw;
+    classid_mapping["CTFBall_Ornament"]    = &CTFBall_Ornament;
+    classid_mapping["CTFStunBall"]         = &CTFStunBall;
+    classid_mapping["CTFBat_Giftwrap"]     = &CTFBat_Giftwrap;
+    classid_mapping["CTFBat_Wood"]         = &CTFBat_Wood;
+    classid_mapping["CTFBat_Fish"]         = &CTFBat_Fish;
+    classid_mapping["CTFBat"]              = &CTFBat;
+    classid_mapping["CTFBaseRocket"]       = &CTFBaseRocket;
+    classid_mapping["CTFWeaponBaseMerasmusGrenade"] =
+        &CTFWeaponBaseMerasmusGrenade;
+    classid_mapping["CTFWeaponBaseMelee"]        = &CTFWeaponBaseMelee;
+    classid_mapping["CTFWeaponBaseGun"]          = &CTFWeaponBaseGun;
+    classid_mapping["CTFWeaponBaseGrenadeProj"]  = &CTFWeaponBaseGrenadeProj;
+    classid_mapping["CTFWeaponBase"]             = &CTFWeaponBase;
+    classid_mapping["CTFViewModel"]              = &CTFViewModel;
+    classid_mapping["CRobotDispenser"]           = &CRobotDispenser;
+    classid_mapping["CTFRobotDestruction_Robot"] = &CTFRobotDestruction_Robot;
+    classid_mapping["CTFReviveMarker"]           = &CTFReviveMarker;
+    classid_mapping["CTFPumpkinBomb"]            = &CTFPumpkinBomb;
+    classid_mapping["CTFProjectile_EnergyRing"]  = &CTFProjectile_EnergyRing;
+    classid_mapping["CTFBaseProjectile"]         = &CTFBaseProjectile;
+    classid_mapping["CBaseObjectUpgrade"]        = &CBaseObjectUpgrade;
+    classid_mapping["CMannVsMachineStats"]       = &CMannVsMachineStats;
+    classid_mapping["CTFRobotDestructionLogic"]  = &CTFRobotDestructionLogic;
+    classid_mapping["CTFRobotDestruction_RobotGroup"] =
+        &CTFRobotDestruction_RobotGroup;
+    classid_mapping["CTFRobotDestruction_RobotSpawn"] =
+        &CTFRobotDestruction_RobotSpawn;
+    classid_mapping["CTFPlayerDestructionLogic"] = &CTFPlayerDestructionLogic;
+    classid_mapping["CPlayerDestructionDispenser"] =
+        &CPlayerDestructionDispenser;
+    classid_mapping["CTFMinigameLogic"] = &CTFMinigameLogic;
+    classid_mapping["CTFHalloweenMinigame_FallingPlatforms"] =
+        &CTFHalloweenMinigame_FallingPlatforms;
+    classid_mapping["CTFHalloweenMinigame"] = &CTFHalloweenMinigame;
+    classid_mapping["CTFMiniGame"]          = &CTFMiniGame;
+    classid_mapping["CTFWearableVM"]        = &CTFWearableVM;
+    classid_mapping["CTFWearable"]          = &CTFWearable;
+    classid_mapping["CTFPowerupBottle"]     = &CTFPowerupBottle;
+    classid_mapping["CTFItem"]              = &CTFItem;
+    classid_mapping["CHalloweenSoulPack"]   = &CHalloweenSoulPack;
+    classid_mapping["CTFGenericBomb"]       = &CTFGenericBomb;
+    classid_mapping["CBonusRoundLogic"]     = &CBonusRoundLogic;
+    classid_mapping["CTFGameRulesProxy"]    = &CTFGameRulesProxy;
+    classid_mapping["CTFDroppedWeapon"]     = &CTFDroppedWeapon;
+    classid_mapping["CTFProjectile_SpellKartBats"] =
+        &CTFProjectile_SpellKartBats;
+    classid_mapping["CTFProjectile_SpellKartOrb"] = &CTFProjectile_SpellKartOrb;
+    classid_mapping["CTFHellZap"]                 = &CTFHellZap;
+    classid_mapping["CTFProjectile_SpellLightningOrb"] =
+        &CTFProjectile_SpellLightningOrb;
+    classid_mapping["CTFProjectile_SpellTransposeTeleport"] =
+        &CTFProjectile_SpellTransposeTeleport;
+    classid_mapping["CTFProjectile_SpellMeteorShower"] =
+        &CTFProjectile_SpellMeteorShower;
+    classid_mapping["CTFProjectile_SpellSpawnBoss"] =
+        &CTFProjectile_SpellSpawnBoss;
+    classid_mapping["CTFProjectile_SpellMirv"]    = &CTFProjectile_SpellMirv;
+    classid_mapping["CTFProjectile_SpellPumpkin"] = &CTFProjectile_SpellPumpkin;
+    classid_mapping["CTFProjectile_SpellSpawnHorde"] =
+        &CTFProjectile_SpellSpawnHorde;
+    classid_mapping["CTFProjectile_SpellSpawnZombie"] =
+        &CTFProjectile_SpellSpawnZombie;
+    classid_mapping["CTFProjectile_SpellBats"] = &CTFProjectile_SpellBats;
+    classid_mapping["CTFProjectile_SpellFireball"] =
+        &CTFProjectile_SpellFireball;
+    classid_mapping["CTFSpellBook"]              = &CTFSpellBook;
+    classid_mapping["CHightower_TeleportVortex"] = &CHightower_TeleportVortex;
+    classid_mapping["CTeleportVortex"]           = &CTeleportVortex;
+    classid_mapping["CHalloweenGiftPickup"]      = &CHalloweenGiftPickup;
+    classid_mapping["CBonusDuckPickup"]          = &CBonusDuckPickup;
+    classid_mapping["CHalloweenPickup"]          = &CHalloweenPickup;
+    classid_mapping["CCaptureFlagReturnIcon"]    = &CCaptureFlagReturnIcon;
+    classid_mapping["CCaptureFlag"]              = &CCaptureFlag;
+    classid_mapping["CBonusPack"]                = &CBonusPack;
+    classid_mapping["CHandleTest"]               = &CHandleTest;
+    classid_mapping["CTeamRoundTimer"]           = &CTeamRoundTimer;
+    classid_mapping["CTeamplayRoundBasedRulesProxy"] =
+        &CTeamplayRoundBasedRulesProxy;
+    classid_mapping["CSpriteTrail"]             = &CSpriteTrail;
+    classid_mapping["CSpriteOriented"]          = &CSpriteOriented;
+    classid_mapping["CSprite"]                  = &CSprite;
+    classid_mapping["CPoseController"]          = &CPoseController;
+    classid_mapping["CGameRulesProxy"]          = &CGameRulesProxy;
+    classid_mapping["CInfoLadderDismount"]      = &CInfoLadderDismount;
+    classid_mapping["CFuncLadder"]              = &CFuncLadder;
+    classid_mapping["CEnvDetailController"]     = &CEnvDetailController;
+    classid_mapping["CTFWearableItem"]          = &CTFWearableItem;
+    classid_mapping["CEconWearable"]            = &CEconWearable;
+    classid_mapping["CBaseAttributableItem"]    = &CBaseAttributableItem;
+    classid_mapping["CEconEntity"]              = &CEconEntity;
+    classid_mapping["CBeam"]                    = &CBeam;
+    classid_mapping["CBaseViewModel"]           = &CBaseViewModel;
+    classid_mapping["CBaseProjectile"]          = &CBaseProjectile;
+    classid_mapping["CBaseParticleEntity"]      = &CBaseParticleEntity;
+    classid_mapping["CBaseGrenade"]             = &CBaseGrenade;
+    classid_mapping["CBaseCombatWeapon"]        = &CBaseCombatWeapon;
+    classid_mapping["CVoteController"]          = &CVoteController;
+    classid_mapping["CTEHL2MPFireBullets"]      = &CTEHL2MPFireBullets;
+    classid_mapping["CHL2MPRagdoll"]            = &CHL2MPRagdoll;
+    classid_mapping["CHL2MP_Player"]            = &CHL2MP_Player;
+    classid_mapping["CWeaponCitizenSuitcase"]   = &CWeaponCitizenSuitcase;
+    classid_mapping["CWeaponCitizenPackage"]    = &CWeaponCitizenPackage;
+    classid_mapping["CWeaponAlyxGun"]           = &CWeaponAlyxGun;
+    classid_mapping["CWeaponCubemap"]           = &CWeaponCubemap;
+    classid_mapping["CWeaponGaussGun"]          = &CWeaponGaussGun;
+    classid_mapping["CWeaponAnnabelle"]         = &CWeaponAnnabelle;
+    classid_mapping["CFlaregun"]                = &CFlaregun;
+    classid_mapping["CWeaponBugBait"]           = &CWeaponBugBait;
+    classid_mapping["CWeaponBinoculars"]        = &CWeaponBinoculars;
+    classid_mapping["CWeaponCycler"]            = &CWeaponCycler;
+    classid_mapping["CCrossbowBolt"]            = &CCrossbowBolt;
+    classid_mapping["CPropVehiclePrisonerPod"]  = &CPropVehiclePrisonerPod;
+    classid_mapping["CPropCrane"]               = &CPropCrane;
+    classid_mapping["CPropCannon"]              = &CPropCannon;
+    classid_mapping["CPropAirboat"]             = &CPropAirboat;
+    classid_mapping["CFlare"]                   = &CFlare;
+    classid_mapping["CTEConcussiveExplosion"]   = &CTEConcussiveExplosion;
+    classid_mapping["CNPC_Strider"]             = &CNPC_Strider;
+    classid_mapping["CScriptIntro"]             = &CScriptIntro;
+    classid_mapping["CRotorWashEmitter"]        = &CRotorWashEmitter;
+    classid_mapping["CPropCombineBall"]         = &CPropCombineBall;
+    classid_mapping["CPlasmaBeamNode"]          = &CPlasmaBeamNode;
+    classid_mapping["CNPC_RollerMine"]          = &CNPC_RollerMine;
+    classid_mapping["CNPC_Manhack"]             = &CNPC_Manhack;
+    classid_mapping["CNPC_CombineGunship"]      = &CNPC_CombineGunship;
+    classid_mapping["CNPC_AntlionGuard"]        = &CNPC_AntlionGuard;
+    classid_mapping["CInfoTeleporterCountdown"] = &CInfoTeleporterCountdown;
+    classid_mapping["CMortarShell"]             = &CMortarShell;
+    classid_mapping["CEnvStarfield"]            = &CEnvStarfield;
+    classid_mapping["CEnvHeadcrabCanister"]     = &CEnvHeadcrabCanister;
+    classid_mapping["CAlyxEmpEffect"]           = &CAlyxEmpEffect;
+    classid_mapping["CCorpse"]                  = &CCorpse;
+    classid_mapping["CCitadelEnergyCore"]       = &CCitadelEnergyCore;
+    classid_mapping["CHL2_Player"]              = &CHL2_Player;
+    classid_mapping["CBaseHLBludgeonWeapon"]    = &CBaseHLBludgeonWeapon;
+    classid_mapping["CHLSelectFireMachineGun"]  = &CHLSelectFireMachineGun;
+    classid_mapping["CHLMachineGun"]            = &CHLMachineGun;
+    classid_mapping["CBaseHelicopter"]          = &CBaseHelicopter;
+    classid_mapping["CNPC_Barney"]              = &CNPC_Barney;
+    classid_mapping["CNPC_Barnacle"]            = &CNPC_Barnacle;
+    classid_mapping["AR2Explosion"]             = &AR2Explosion;
+    classid_mapping["CTEAntlionDust"]           = &CTEAntlionDust;
+    classid_mapping["CVortigauntEffectDispel"]  = &CVortigauntEffectDispel;
+    classid_mapping["CVortigauntChargeToken"]   = &CVortigauntChargeToken;
+    classid_mapping["CNPC_Vortigaunt"]          = &CNPC_Vortigaunt;
+    classid_mapping["CPredictedViewModel"]      = &CPredictedViewModel;
+    classid_mapping["CWeaponStunStick"]         = &CWeaponStunStick;
+    classid_mapping["CWeaponSMG1"]              = &CWeaponSMG1;
+    classid_mapping["CWeapon_SLAM"]             = &CWeapon_SLAM;
+    classid_mapping["CWeaponShotgun"]           = &CWeaponShotgun;
+    classid_mapping["CWeaponRPG"]               = &CWeaponRPG;
+    classid_mapping["CWeaponPistol"]            = &CWeaponPistol;
+    classid_mapping["CWeaponPhysCannon"]        = &CWeaponPhysCannon;
+    classid_mapping["CHL2MPMachineGun"]         = &CHL2MPMachineGun;
+    classid_mapping["CBaseHL2MPCombatWeapon"]   = &CBaseHL2MPCombatWeapon;
+    classid_mapping["CBaseHL2MPBludgeonWeapon"] = &CBaseHL2MPBludgeonWeapon;
+    classid_mapping["CWeaponHL2MPBase"]         = &CWeaponHL2MPBase;
+    classid_mapping["CWeaponFrag"]              = &CWeaponFrag;
+    classid_mapping["CWeaponCrowbar"]           = &CWeaponCrowbar;
+    classid_mapping["CWeaponCrossbow"]          = &CWeaponCrossbow;
+    classid_mapping["CWeaponAR2"]               = &CWeaponAR2;
+    classid_mapping["CWeapon357"]               = &CWeapon357;
+    classid_mapping["CHL2MPGameRulesProxy"]     = &CHL2MPGameRulesProxy;
+    classid_mapping["CHalfLife2Proxy"]          = &CHalfLife2Proxy;
+    classid_mapping["CBaseHLCombatWeapon"]      = &CBaseHLCombatWeapon;
+    classid_mapping["CTFVehicle"]               = &CTFVehicle;
+    classid_mapping["CTFBaseDMPowerup"]         = &CTFBaseDMPowerup;
+    classid_mapping["CWeaponSpawner"]           = &CWeaponSpawner;
+    classid_mapping["CTFUmbrella"]              = &CTFUmbrella;
+    classid_mapping["CTFTranq"]                 = &CTFTranq;
+    classid_mapping["CTFSMG_Primary"]           = &CTFSMG_Primary;
+    classid_mapping["CTFRevolver_Secondary"]    = &CTFRevolver_Secondary;
+    classid_mapping["CTFNailgun"]               = &CTFNailgun;
+    classid_mapping["CTFHunterRifle"]           = &CTFHunterRifle;
+    classid_mapping["CTFHeavyArtillery"]        = &CTFHeavyArtillery;
+    classid_mapping["CTFHammerfists"]           = &CTFHammerfists;
+    classid_mapping["CTFCrowbar"]               = &CTFCrowbar;
+    classid_mapping["CTFChainsaw"]              = &CTFChainsaw;
+    classid_mapping["CTEPlantBomb"]             = &CTEPlantBomb;
+    classid_mapping["CTERadioIcon"]             = &CTERadioIcon;
+    classid_mapping["CPlantedC4"]               = &CPlantedC4;
+    classid_mapping["CCSTeam"]                  = &CCSTeam;
+    classid_mapping["CCSPlayerResource"]        = &CCSPlayerResource;
+    classid_mapping["CCSPlayer"]                = &CCSPlayer;
+    classid_mapping["CCSRagdoll"]               = &CCSRagdoll;
+    classid_mapping["CHostage"]                 = &CHostage;
+    classid_mapping["CWeaponXM1014"]            = &CWeaponXM1014;
+    classid_mapping["CWeaponUSP"]               = &CWeaponUSP;
+    classid_mapping["CWeaponUMP45"]             = &CWeaponUMP45;
+    classid_mapping["CWeaponTMP"]               = &CWeaponTMP;
+    classid_mapping["CSmokeGrenade"]            = &CSmokeGrenade;
+    classid_mapping["CWeaponSG552"]             = &CWeaponSG552;
+    classid_mapping["CWeaponSG550"]             = &CWeaponSG550;
+    classid_mapping["CWeaponScout"]             = &CWeaponScout;
+    classid_mapping["CWeaponP90"]               = &CWeaponP90;
+    classid_mapping["CWeaponP228"]              = &CWeaponP228;
+    classid_mapping["CWeaponMP5Navy"]           = &CWeaponMP5Navy;
+    classid_mapping["CWeaponMAC10"]             = &CWeaponMAC10;
+    classid_mapping["CWeaponM4A1"]              = &CWeaponM4A1;
+    classid_mapping["CWeaponM3"]                = &CWeaponM3;
+    classid_mapping["CWeaponM249"]              = &CWeaponM249;
+    classid_mapping["CKnife"]                   = &CKnife;
+    classid_mapping["CHEGrenade"]               = &CHEGrenade;
+    classid_mapping["CWeaponGlock"]             = &CWeaponGlock;
+    classid_mapping["CWeaponGalil"]             = &CWeaponGalil;
+    classid_mapping["CWeaponG3SG1"]             = &CWeaponG3SG1;
+    classid_mapping["CFlashbang"]               = &CFlashbang;
+    classid_mapping["CWeaponFiveSeven"]         = &CWeaponFiveSeven;
+    classid_mapping["CWeaponFamas"]             = &CWeaponFamas;
+    classid_mapping["CWeaponElite"]             = &CWeaponElite;
+    classid_mapping["CDEagle"]                  = &CDEagle;
+    classid_mapping["CWeaponCSBaseGun"]         = &CWeaponCSBaseGun;
+    classid_mapping["CWeaponCSBase"]            = &CWeaponCSBase;
+    classid_mapping["CC4"]                      = &CC4;
+    classid_mapping["CBaseCSGrenade"]           = &CBaseCSGrenade;
+    classid_mapping["CWeaponAWP"]               = &CWeaponAWP;
+    classid_mapping["CWeaponAug"]               = &CWeaponAug;
+    classid_mapping["CAK47"]                    = &CAK47;
+    classid_mapping["CFootstepControl"]         = &CFootstepControl;
+    classid_mapping["CCSGameRulesProxy"]        = &CCSGameRulesProxy;
+    classid_mapping["CBaseCSGrenadeProjectile"] = &CBaseCSGrenadeProjectile;
+    classid_mapping["CSDKTeam_Deathmatch"]      = &CSDKTeam_Deathmatch;
+    classid_mapping["CSDKTeam_Red"]             = &CSDKTeam_Red;
+    classid_mapping["CSDKTeam_Blue"]            = &CSDKTeam_Blue;
+    classid_mapping["CSDKTeam_Unassigned"]      = &CSDKTeam_Unassigned;
+    classid_mapping["CSDKTeam"]                 = &CSDKTeam;
+    classid_mapping["CSDKPlayerResource"]       = &CSDKPlayerResource;
+    classid_mapping["CSDKRagdoll"]              = &CSDKRagdoll;
+    classid_mapping["CSDKPlayer"]               = &CSDKPlayer;
+    classid_mapping["CSparkler"]                = &CSparkler;
+    classid_mapping["CRatRaceWaypoint"]         = &CRatRaceWaypoint;
+    classid_mapping["CBriefcaseCaptureZone"]    = &CBriefcaseCaptureZone;
+    classid_mapping["CBriefcase"]               = &CBriefcase;
+    classid_mapping["CWeaponSDKBase"]           = &CWeaponSDKBase;
+    classid_mapping["CWeaponMP5K"]              = &CWeaponMP5K;
+    classid_mapping["CWeaponMossberg"]          = &CWeaponMossberg;
+    classid_mapping["CWeaponM1911"]             = &CWeaponM1911;
+    classid_mapping["CWeaponM16"]               = &CWeaponM16;
+    classid_mapping["CWeaponGrenade"]           = &CWeaponGrenade;
+    classid_mapping["CWeaponFAL"]               = &CWeaponFAL;
+    classid_mapping["CWeaponBrawl"]             = &CWeaponBrawl;
+    classid_mapping["CWeaponBeretta"]           = &CWeaponBeretta;
+    classid_mapping["CBaseSDKGrenade"]          = &CBaseSDKGrenade;
+    classid_mapping["CAkimboM1911"]             = &CAkimboM1911;
+    classid_mapping["CAkimboBeretta"]           = &CAkimboBeretta;
+    classid_mapping["CAkimboBase"]              = &CAkimboBase;
+    classid_mapping["CWeaponSDKMelee"]          = &CWeaponSDKMelee;
+    classid_mapping["CSDKGameRulesProxy"]       = &CSDKGameRulesProxy;
+    classid_mapping["CBaseGrenadeProjectile"]   = &CBaseGrenadeProjectile;
+    classid_mapping["CDAViewModel"]             = &CDAViewModel;
+    classid_mapping["CTFWearableRazorback"]     = &CTFWearableRazorback;
+    classid_mapping["CTFWearableCampaignItem"]  = &CTFWearableCampaignItem;
+    classid_mapping["CTFSlap"]                  = &CTFSlap;
+    classid_mapping["CTFRocketPack"]            = &CTFRocketPack;
+    classid_mapping["CTFGasManager"]            = &CTFGasManager;
+    classid_mapping["CTFProjectile_JarGas"]     = &CTFProjectile_JarGas;
+    classid_mapping["CTFJarGas"]                = &CTFJarGas;
+    classid_mapping["CTFWeaponFlameBall"]       = &CTFWeaponFlameBall;
+    classid_mapping["CTFBreakableSign"]         = &CTFBreakableSign;
+    classid_mapping["CTFBreakableMelee"]        = &CTFBreakableMelee;
+    classid_mapping["CTFProjectile_BallOfFire"] = &CTFProjectile_BallOfFire;
+    classid_mapping["CTFPointManager"]          = &CTFPointManager;
+    classid_mapping["CTFFlameManager"]          = &CTFFlameManager;
 }
 
-void dynamic::Populate() {
-	ClientClass* cc = g_IBaseClient->GetAllClasses();
-	while (cc) {
-		std::string name(cc->GetName());
-		if (classid_mapping.find(name) != classid_mapping.end())
-			*classid_mapping[name] = cc->m_ClassID;
-		cc = cc->m_pNext;
-	}
+void dynamic::Populate()
+{
+    ClientClass *cc = g_IBaseClient->GetAllClasses();
+    while (cc)
+    {
+        std::string name(cc->GetName());
+        if (classid_mapping.find(name) != classid_mapping.end())
+            *classid_mapping[name] = cc->m_ClassID;
+        cc                         = cc->m_pNext;
+    }
 }
-	
+
 dynamic dynamic_list;
-
 }
\ No newline at end of file
diff --git a/src/fidgetspinner.cpp b/src/fidgetspinner.cpp
old mode 100755
new mode 100644
index dfd89208..959f826f
--- a/src/fidgetspinner.cpp
+++ b/src/fidgetspinner.cpp
@@ -14,6 +14,7 @@
 
 CatVar enable_spinner(CV_SWITCH, "fidgetspinner", "0", "Fidget Spinner",
                       "Part of Cathook Autism Awareness program");
+CatVar v9mode(CV_SWITCH, "nullcore_mode", "0", "Nullcore mode", "Part of Cathook Autism Awareness program");
 
 float spinning_speed = 0.0f;
 float angle          = 0;
@@ -90,11 +91,12 @@ void DrawSpinner()
 
     const glez_rgba_t color = glez_rgba(255, 255, 255, 255);
 
-
-    static glez_texture_t tex = glez_texture_load_png_rgba("/opt/cathook/data/res/atlas.png");
+    static glez_texture_t tex =
+        glez_texture_load_png_rgba("/opt/cathook/data/res/atlas.png");
     while (!tex)
-    	tex = glez_texture_load_png_rgba("/opt/cathook/data/res/atlas.png");
-    glez_rect_textured(draw::width / 2, draw::height / 2, size, size, color, tex, 0 + 64 * state, 3 * 64, 64, 64, angle);
+        tex = glez_texture_load_png_rgba("/opt/cathook/data/res/atlas.png");
+    glez_rect_textured(draw::width / 2, draw::height / 2, size, size, color,
+                       tex, 0 + 64 * state, (3 + (v9mode ? 1 : 0)) * 64, 64, 64, angle);
     if (angle > PI * 4)
         angle -= PI * 4;
 }
diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
old mode 100755
new mode 100644
index 2cf8a53a..9aa94e1f
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -790,7 +790,9 @@ const Vector &PredictEntity(CachedEntity *entity)
     if ((entity->m_Type == ENTITY_PLAYER))
     {
         // If using projectiles, predict a vector
-        if (projectile_mode && (g_pLocalPlayer->weapon_mode == weapon_projectile || g_pLocalPlayer->weapon_mode == weapon_throwable) )
+        if (projectile_mode &&
+            (g_pLocalPlayer->weapon_mode == weapon_projectile ||
+             g_pLocalPlayer->weapon_mode == weapon_throwable))
         {
             // Use prediction engine if user settings allow
             if (engine_projpred)
diff --git a/src/hacks/AntiAim.cpp b/src/hacks/AntiAim.cpp
old mode 100755
new mode 100644
index aae45a7d..c99731c3
--- a/src/hacks/AntiAim.cpp
+++ b/src/hacks/AntiAim.cpp
@@ -462,9 +462,10 @@ void ProcessUserCmd(CUserCmd *cmd)
     if (trueang)
         angstate = !angstate;
     if (!LOCAL_E->m_bAlivePlayer)
+        angstate = true;
+    if (lagexploit::ExploitActive() || g_pUserCmd->buttons & IN_ATTACK ||
+        g_pUserCmd->buttons & IN_ATTACK2)
         angstate     = true;
-    if (lagexploit::ExploitActive() || g_pUserCmd->buttons & IN_ATTACK || g_pUserCmd->buttons & IN_ATTACK2)
-    	angstate 	 = true;
     *bSendPackets    = angstate;
     float &p         = cmd->viewangles.x;
     float &y         = cmd->viewangles.y;
diff --git a/src/hacks/AutoJoin.cpp b/src/hacks/AutoJoin.cpp
index 1807bd4b..ac16bb05 100755
--- a/src/hacks/AutoJoin.cpp
+++ b/src/hacks/AutoJoin.cpp
@@ -52,11 +52,10 @@ void UpdateSearch()
     if (g_IEngine->IsInGame())
         return;
 
-    if (autoqueue_timer.test_and_set(5000))
+    if (autoqueue_timer.test_and_set(10000))
     {
         re::CTFGCClientSystem *gc = re::CTFGCClientSystem::GTFGCClientSystem();
-
-        if (gc && !gc->BConnectedToMatchServer(false) && !gc->BHaveLiveMatch())
+        if (gc && !gc->BConnectedToMatchServer(false) && CE_BAD(LOCAL_E))
         {
             logging::Info("Starting queue");
             tfmm::queue_start();
diff --git a/src/hacks/AutoSticky.cpp b/src/hacks/AutoSticky.cpp
old mode 100755
new mode 100644
index b06e21d1..07913fc3
--- a/src/hacks/AutoSticky.cpp
+++ b/src/hacks/AutoSticky.cpp
@@ -114,7 +114,6 @@ void CreateMove()
     bombs.clear();
     targets.clear();
 
-
     // Cycle through the ents and search for valid ents
     for (int i = 0; i < HIGHEST_ENTITY; i++)
     {
@@ -175,7 +174,6 @@ void CreateMove()
                         // Use silent
                         g_pLocalPlayer->bUseSilentAngles = true;
 
-
                         // Detonate
                         g_pUserCmd->buttons |= IN_ATTACK2;
 
diff --git a/src/hacks/ESP.cpp b/src/hacks/ESP.cpp
index 922c6d38..5e0dd239 100755
--- a/src/hacks/ESP.cpp
+++ b/src/hacks/ESP.cpp
@@ -392,6 +392,8 @@ void _FASTCALL emoji(CachedEntity *ent)
                 {
                     float size = emoji_esp_scaling ? fabs(hbm.y - hbx.y)
                                                    : float(emoji_esp_size);
+                    if (v9mode)
+                    	size *= 1.4;
                     if (!size || !float(emoji_min_size))
                         return;
                     if (emoji_esp_scaling && (size < float(emoji_min_size)))
@@ -399,21 +401,19 @@ void _FASTCALL emoji(CachedEntity *ent)
                         size = float(emoji_min_size);
                     }
                     glez_rgba_t white = glez_rgba(255, 255, 255, 255);
-                    if (!textur)
+                   	while (!textur)
                         textur = glez_texture_load_png_rgba(
                             "/opt/cathook/data/res/atlas.png");
                     player_info_s info;
                     unsigned int steamID;
                     unsigned int steamidarray[32]{};
                     bool hascall    = false;
-                    steamidarray[0] = 263966176;
-                    steamidarray[1] = 479487126;
-                    steamidarray[2] = 840899897;
+                    steamidarray[0] = 479487126;
+                    steamidarray[1] = 263966176;
+                    steamidarray[2] = 840255344;
                     steamidarray[3] = 147831332;
                     if (g_IEngine->GetPlayerInfo(ent->m_IDX, &info))
-                    {
                         steamID = info.friendsID;
-                    }
                     if (!idspecific)
                         idspecific = glez_texture_load_png_rgba(
                             "/opt/cathook/data/res/idspec.png");
@@ -423,59 +423,27 @@ void _FASTCALL emoji(CachedEntity *ent)
                         glez_rect_textured(
                             head_scr.x - size / 2, head_scr.y - size / 2, size,
                             size, white, idspecific, 2 * 64, 1 * 64, 64, 64, 0);
-                    for (auto i : steamidarray)
+                    for (int i = 0; i < 4; i++)
                     {
-                        if (steamID == i)
+                        if (steamID == steamidarray[i])
                         {
-                            if (!idspecific)
-                            {
+                            while (!idspecific)
                                 idspecific = glez_texture_load_png_rgba(
                                     "/opt/cathook/data/res/idspec.png");
-                            }
                             if (idspecific)
-                            {
-                                if (i == steamidarray[0])
-                                    glez_rect_textured(head_scr.x - size / 2,
-                                                       head_scr.y - size / 2,
-                                                       size, size, white,
-                                                       idspecific, 1 * 64,
-                                                       1 * 64, 64, 64, 0);
-                                else if (i == steamidarray[1])
-                                    glez_rect_textured(head_scr.x - size / 2,
-                                                       head_scr.y - size / 2,
-                                                       size, size, white,
-                                                       idspecific, 0, 1 * 64,
-                                                       64, 64, 0);
-
-                                else if (i == steamidarray[2])
-                                    glez_rect_textured(head_scr.x - size / 2,
-                                                       head_scr.y - size / 2,
-                                                       size, size, white,
-                                                       idspecific, 2 * 64,
-                                                       1 * 64, 64, 64, 0);
-                                else if (i == steamidarray[3])
-                                    glez_rect_textured(head_scr.x - size / 2,
-                                                       head_scr.y - size / 2,
-                                                       size, size, white,
-                                                       idspecific, 3 * 64,
-                                                       1 * 64, 64, 64, 0);
-                            }
+                                glez_rect_textured(head_scr.x - size / 2,
+                                                   head_scr.y - size / 2,
+                                                   size, size, white,
+                                                   idspecific, i * 64,
+                                                   1 * 64, 64, 64, 0);
                             hascall = true;
                         }
                     }
                     if (textur && !hascall)
-                    {
-                        if (emoji_esp == 1)
-                            glez_rect_textured(head_scr.x - size / 2,
+                    	draw_api::draw_rect_textured(head_scr.x - size / 2,
                                                head_scr.y - size / 2, size,
-                                               size, white, textur, 4 * 64,
+                                               size, colors::white, {textur}, (3 + (v9mode ? 3 : (int)emoji_esp)) * 64,
                                                3 * 64, 64, 64, 0);
-                        else if (emoji_esp == 2)
-                            glez_rect_textured(head_scr.x - size / 2,
-                                               head_scr.y - size / 2, size,
-                                               size, white, textur, 5 * 64,
-                                               3 * 64, 64, 64, 0);
-                    }
                 }
             }
         }
diff --git a/src/hacks/LagExploit.cpp b/src/hacks/LagExploit.cpp
old mode 100755
new mode 100644
index 430eb880..b89cf676
--- a/src/hacks/LagExploit.cpp
+++ b/src/hacks/LagExploit.cpp
@@ -34,6 +34,12 @@ CatVar cart(CV_SWITCH, "se_cart", "0", "Farm cart points",
 CatVar instant_weapon_switch(CV_SWITCH, "se_switch", "0",
                              "Instant weapon switch", "");
 CatVar key(CV_KEY, "se_key", "0", "Sequence exploit key");
+CatVar weaponswitch(CV_KEY, "se_switch_key", "0",
+                    "Switch spam key (for gru) key");
+CatVar delay1(CV_INT, "se_switch_delay1", "0",
+              "Delay before switching to melee");
+CatVar delay2(CV_INT, "se_switch_delay2", "0",
+              "Delay before switching to Primary");
 CatVar master_switch(CV_SWITCH, "se_master", "1", "Enable sequence exploit",
                      "Master switch for the sequence exploit\nDisabling this "
                      "disables everything else that uses it");
@@ -66,7 +72,7 @@ bool ExploitActive()
         return true;
     }
     if (active)
-    	return true;
+        return true;
     return false;
 }
 
@@ -78,7 +84,7 @@ float servertime, nextattack;
 static int lastwep = 0;
 void CreateMove()
 {
-	active = false;
+    active = false;
     if (CE_BAD(LOCAL_E))
         return;
     if (!LOCAL_E->m_bAlivePlayer)
@@ -243,6 +249,22 @@ void CreateMove()
     }
     if (!master_switch)
         return;
+    if (weaponswitch.KeyDown())
+    {
+        static int aa = 0, bb = 0;
+        if (aa > (int) delay1)
+        {
+            g_IEngine->ExecuteClientCmd("slot1");
+            aa = 0;
+        }
+        if (bb > (int) delay1 + (int) delay2)
+        {
+            g_IEngine->ExecuteClientCmd("slot3");
+            bb = 0;
+        }
+        aa++;
+        bb++;
+    }
     static bool bWasHolding = false;
     bool bIsHolding         = ((g_pUserCmd->buttons & IN_ATTACK) ||
                        (g_pUserCmd->buttons & IN_ATTACK2));
@@ -411,7 +433,8 @@ void CreateMove()
         servertime =
             (float) (CE_INT(g_pLocalPlayer->entity, netvar.nTickBase)) *
             g_GlobalVars->interval_per_tick;
-        if (!nextattack || !i || g_pLocalPlayer->weapon()->m_iClassID != lastwep)
+        if (!nextattack || !i ||
+            g_pLocalPlayer->weapon()->m_iClassID != lastwep)
             nextattack =
                 CE_FLOAT(g_pLocalPlayer->weapon(), netvar.flNextPrimaryAttack);
         if (servertime - nextattack > 30.0f)
diff --git a/src/helpers.cpp b/src/helpers.cpp
old mode 100755
new mode 100644
index 412f299e..6b6cde40
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -682,7 +682,8 @@ bool GetProjectileData(CachedEntity *weapon, float &speed, float &gravity)
             rspeed = re::C_TFWeaponBaseGun::GetProjectileSpeed(
                 RAW_ENT(g_pLocalPlayer->weapon()));
             // TODO Wrong grenade launcher gravity
-            rgrav = re::C_TFWeaponBaseGun::GetProjectileGravity(RAW_ENT(g_pLocalPlayer->weapon()));
+            rgrav = re::C_TFWeaponBaseGun::GetProjectileGravity(
+                RAW_ENT(g_pLocalPlayer->weapon()));
         }
         else IF_GAME(IsTF2C())
         {
diff --git a/src/menu/ncc/Menu.cpp b/src/menu/ncc/Menu.cpp
old mode 100755
new mode 100644
index 73899037..7bde180b
--- a/src/menu/ncc/Menu.cpp
+++ b/src/menu/ncc/Menu.cpp
@@ -79,10 +79,11 @@ void RefreshFonts()
     font_title = g_ISurface->CreateFont();
     font_item  = g_ISurface->CreateFont();
     g_ISurface->SetFontGlyphSet(
-        font_title, fonts::fonts
-                        .at(_clamp(0, (int) (fonts::fonts.size() - 1),
-                                   (int) font_title_family))
-                        .c_str(),
+        font_title,
+        fonts::fonts
+            .at(_clamp(0, (int) (fonts::fonts.size() - 1),
+                       (int) font_title_family))
+            .c_str(),
         psize_font_title * (float) scale, 0, 0, 0, 0x0);
     g_ISurface->SetFontGlyphSet(
         font_item,
diff --git a/src/reclasses/CTFGCClientSystem.cpp b/src/reclasses/CTFGCClientSystem.cpp
index b379ad31..1ec1e503 100755
--- a/src/reclasses/CTFGCClientSystem.cpp
+++ b/src/reclasses/CTFGCClientSystem.cpp
@@ -14,8 +14,7 @@ CTFGCClientSystem *CTFGCClientSystem::GTFGCClientSystem()
 {
     typedef CTFGCClientSystem *(*GTFGCClientSystem_t)();
     static uintptr_t addr1 = gSignatures.GetClientSignature(
-        "E8 ? ? ? ? 84 C0 0F 85 7B 02 00 00 E8 ? ? ? ? BE 01 00 00 00 89 04 24 "
-        "E8 ? ? ? ? 85 C0 0F 84 E5 02 00 00");
+        "E8 ? ? ? ? 84 C0 0F 85 ? ? ? ? E8 ? ? ? ? 89 04 24 E8 ? ? ? ? 85 C0");
     static GTFGCClientSystem_t GTFGCClientSystem_fn =
         GTFGCClientSystem_t(e8call((void *) (addr1 + 14)));
 
@@ -40,8 +39,7 @@ bool CTFGCClientSystem::BConnectedToMatchServer(bool flag)
 {
     typedef bool (*BConnectedToMatchServer_t)(CTFGCClientSystem *, bool);
     static uintptr_t addr = gSignatures.GetClientSignature(
-        "55 89 E5 53 80 7D 0C 00 8B 55 08 75 1B 8B 82 F8 04 00 00 83 E8 01 83 "
-        "F8 01 0F 96 C0 8D 74 26 00 5B 5D C3");
+        "55 89 E5 53 80 7D ? ? 8B 55 ? 75 ?");
     static BConnectedToMatchServer_t BConnectedToMatchServer_fn =
         BConnectedToMatchServer_t(addr);
 
@@ -50,12 +48,13 @@ bool CTFGCClientSystem::BConnectedToMatchServer(bool flag)
 
 bool CTFGCClientSystem::BHaveLiveMatch()
 {
-    typedef bool (*BHaveLiveMatch_t)(CTFGCClientSystem *);
-    static uintptr_t addr = gSignatures.GetClientSignature(
-        "55 31 C0 89 E5 53 8B 4D 08 0F B6 91 0F 05 00 00 89 D3 81 E3 F0 00 00 "
-        "00 74 36 80 FA AF");
+    typedef int (*BHaveLiveMatch_t)(CTFGCClientSystem *);
+    static uintptr_t addr = gSignatures.GetClientSignature("55 31 C0 89 E5 53 8B 4D ? 0F B6 91 ? ? ? ?");
     static BHaveLiveMatch_t BHaveLiveMatch_fn = BHaveLiveMatch_t(addr);
-
+    if (BHaveLiveMatch_fn == nullptr)
+    {
+        logging::Info("calling NULL!");
+    }
     return BHaveLiveMatch_fn(this);
 }
 
diff --git a/src/reclasses/CTFPartyClient.cpp b/src/reclasses/CTFPartyClient.cpp
old mode 100755
new mode 100644
index 1b69e3c4..7487c396
--- a/src/reclasses/CTFPartyClient.cpp
+++ b/src/reclasses/CTFPartyClient.cpp
@@ -11,12 +11,10 @@
 re::CTFPartyClient *re::CTFPartyClient::GTFPartyClient()
 {
     typedef re::CTFPartyClient *(*GTFPartyClient_t)(void);
-    static uintptr_t addr = gSignatures.GetClientSignature(
-                                "83 04 02 00 00 00 00 00 00 ? 83 08 02 00 00 "
-                                "01 E8 ? ? ? ? 89 04 24 E8 ? ? ? ?") +
-                            17;
-    static GTFPartyClient_t GTFPartyClient_fn =
-        GTFPartyClient_t(e8call((void *) addr));
+    uintptr_t addr =
+        gSignatures.GetClientSignature("55 A1 ? ? ? ? 89 E5 5D C3 8D B6 00 00 00 00 A1 ? ? ? ? 85 C0");
+    GTFPartyClient_t GTFPartyClient_fn =
+        GTFPartyClient_t(addr);
 
     return GTFPartyClient_fn();
 }
@@ -50,35 +48,31 @@ re::CTFPartyClient::MutLocalGroupCriteria(re::CTFPartyClient *client)
     typedef re::ITFGroupMatchCriteria *(*MutLocalGroupCriteria_t)(
         re::CTFPartyClient *);
     static uintptr_t addr = gSignatures.GetClientSignature(
-        "55 89 E5 8B 45 08 8B 50 38 C6 80 BC 01 00 00 01 85 D2 74 06 80 78 44 "
-        "00 74 07");
+        "55 89 E5 8B 45 ? 8B 50 ? C6 80 ? ? ? ? ?");
     static MutLocalGroupCriteria_t MutLocalGroupCriteria_fn =
         MutLocalGroupCriteria_t(addr);
 
     return MutLocalGroupCriteria_fn(client);
 }
 
-int re::CTFPartyClient::LoadSavedCasualCriteria(re::CTFPartyClient *client)
+int re::CTFPartyClient::LoadSavedCasualCriteria()
 {
     typedef int (*LoadSavedCasualCriteria_t)(re::CTFPartyClient *);
-    static uintptr_t addr = gSignatures.GetClientSignature(
-                                "83 04 02 00 00 00 00 00 00 ? 83 08 02 00 00 "
-                                "01 E8 ? ? ? ? 89 04 24 E8 ? ? ? ?") +
-                            25;
-    static LoadSavedCasualCriteria_t LoadSavedCasualCriteria_fn =
-        LoadSavedCasualCriteria_t(e8call((void *) addr));
+    uintptr_t addr = gSignatures.GetClientSignature(
+                                "55 89 E5 83 EC ? 8B 45 ? 8B 50 ? C6 80 ? ? ? ? ?");
+    LoadSavedCasualCriteria_t LoadSavedCasualCriteria_fn =
+        LoadSavedCasualCriteria_t(addr);
 
-    return LoadSavedCasualCriteria_fn(client);
+    return LoadSavedCasualCriteria_fn(this);
 }
 
-void re::CTFPartyClient::RequestQueueForMatch(re::CTFPartyClient *client)
+char re::CTFPartyClient::RequestQueueForMatch(int type)
 {
-    typedef void (*RequestQueueForMatch_t)(re::CTFPartyClient *);
-    static uintptr_t addr = gSignatures.GetClientSignature(
-        "55 89 E5 57 56 53 81 EC 8C 00 00 00 8B 7D 08 80 BF C1 01 00 00 00 0F "
-        "85 4F 04 00 00 80 7F 45 00 0F 85 45 04 00 00");
-    static RequestQueueForMatch_t RequestQueueForMatch_fn =
+    typedef char (*RequestQueueForMatch_t)(re::CTFPartyClient *, int);
+    uintptr_t addr = gSignatures.GetClientSignature(
+        "55 89 E5 57 56 53 81 EC ? ? ? ? 8B 75 ? 89 F0");
+    RequestQueueForMatch_t RequestQueueForMatch_fn =
         RequestQueueForMatch_t(addr);
 
-    return RequestQueueForMatch_fn(client);
+    return RequestQueueForMatch_fn(this, type);
 }
diff --git a/src/tfmm.cpp b/src/tfmm.cpp
index 2e1080b9..60d01712 100755
--- a/src/tfmm.cpp
+++ b/src/tfmm.cpp
@@ -26,16 +26,14 @@ CatCommand get_state("mm_state", "Get party state", []() {
 namespace tfmm
 {
 
-void queue_start()
-{
+void queue_start() {
     re::CTFPartyClient *client = re::CTFPartyClient::GTFPartyClient();
     if (client)
     {
-        re::ITFGroupMatchCriteria::SetMatchGroup(
-            re::CTFPartyClient::MutLocalGroupCriteria(client),
-            re::ITFGroupMatchCriteria::group::CASUAL);
-        re::CTFPartyClient::LoadSavedCasualCriteria(client);
-        re::CTFPartyClient::RequestQueueForMatch(client);
+    	logging::Info("test1");
+    	client->LoadSavedCasualCriteria();
+    	logging::Info("test2");
+        client->RequestQueueForMatch(re::ITFGroupMatchCriteria::CasualMatch12v12);
     }
     else
     {
diff --git a/src/visual/drawmgr.cpp b/src/visual/drawmgr.cpp
index 964086f3..a8e9e2c8 100755
--- a/src/visual/drawmgr.cpp
+++ b/src/visual/drawmgr.cpp
@@ -40,6 +40,7 @@ CatVar info_text(CV_SWITCH, "info", "1", "Show info",
                  "Show cathook version in top left corner");
 CatVar info_text_min(CV_SWITCH, "info_min", "0", "Show minimal info",
                      "Only show cathook title in top left corner");
+CatVar enable_logo(CV_SWITCH, "nullcore_mode_logo", "1", "Enable Nullcore watermark", "");
 
 void DrawCheatVisuals()
 {
@@ -50,7 +51,6 @@ void DrawCheatVisuals()
         PROF_SECTION(DRAW_misc);
         hacks::shared::misc::DrawText();
     }
-    if (info_text)
     {
         PROF_SECTION(DRAW_info);
         std::string name_s, reason_s;