diff --git a/register_types.cpp b/register_types.cpp
index 9ed6ed3..65f0171 100644
--- a/register_types.cpp
+++ b/register_types.cpp
@@ -80,80 +80,79 @@ static LimboUtility *_limbo_utility = nullptr;
 
 void initialize_limboai_module(ModuleInitializationLevel p_level) {
 	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
-		ClassDB::register_class<Blackboard>();
+		GDREGISTER_CLASS(Blackboard);
 
-		ClassDB::register_class<LimboState>();
-		ClassDB::register_class<LimboHSM>();
+		GDREGISTER_CLASS(LimboState);
+		GDREGISTER_CLASS(LimboHSM);
 
-		ClassDB::register_class<BTTask>();
-		ClassDB::register_class<BehaviorTree>();
-		ClassDB::register_class<BTPlayer>();
-		ClassDB::register_class<BTState>();
+		GDREGISTER_ABSTRACT_CLASS(BTTask);
+		GDREGISTER_CLASS(BehaviorTree);
+		GDREGISTER_CLASS(BTPlayer);
+		GDREGISTER_CLASS(BTState);
 
-		ClassDB::register_class<BTComposite>();
-		ClassDB::register_class<BTSequence>();
-		ClassDB::register_class<BTDynamicSequence>();
-		ClassDB::register_class<BTDynamicSelector>();
-		ClassDB::register_class<BTSelector>();
-		ClassDB::register_class<BTRandomSelector>();
-		ClassDB::register_class<BTRandomSequence>();
-		ClassDB::register_class<BTSelector>();
-		ClassDB::register_class<BTParallel>();
+		GDREGISTER_CLASS(BTComposite);
+		GDREGISTER_CLASS(BTSequence);
+		GDREGISTER_CLASS(BTSelector);
+		GDREGISTER_CLASS(BTParallel);
+		GDREGISTER_CLASS(BTDynamicSequence);
+		GDREGISTER_CLASS(BTDynamicSelector);
+		GDREGISTER_CLASS(BTRandomSequence);
+		GDREGISTER_CLASS(BTRandomSelector);
 
-		ClassDB::register_class<BTDecorator>();
-		ClassDB::register_class<BTInvert>();
-		ClassDB::register_class<BTAlwaysFail>();
-		ClassDB::register_class<BTAlwaysSucceed>();
-		ClassDB::register_class<BTDelay>();
-		ClassDB::register_class<BTRepeat>();
-		ClassDB::register_class<BTRepeatUntilFailure>();
-		ClassDB::register_class<BTRepeatUntilSuccess>();
-		ClassDB::register_class<BTRunLimit>();
-		ClassDB::register_class<BTTimeLimit>();
-		ClassDB::register_class<BTCooldown>();
-		ClassDB::register_class<BTProbability>();
-		ClassDB::register_class<BTForEach>();
+		GDREGISTER_CLASS(BTDecorator);
+		GDREGISTER_CLASS(BTInvert);
+		GDREGISTER_CLASS(BTAlwaysFail);
+		GDREGISTER_CLASS(BTAlwaysSucceed);
+		GDREGISTER_CLASS(BTDelay);
+		GDREGISTER_CLASS(BTRepeat);
+		GDREGISTER_CLASS(BTRepeatUntilFailure);
+		GDREGISTER_CLASS(BTRepeatUntilSuccess);
+		GDREGISTER_CLASS(BTRunLimit);
+		GDREGISTER_CLASS(BTTimeLimit);
+		GDREGISTER_CLASS(BTCooldown);
+		GDREGISTER_CLASS(BTProbability);
+		GDREGISTER_CLASS(BTForEach);
 
-		ClassDB::register_class<BTAction>();
-		ClassDB::register_class<BTFail>();
-		ClassDB::register_class<BTWait>();
-		ClassDB::register_class<BTRandomWait>();
-		ClassDB::register_class<BTWaitTicks>();
-		ClassDB::register_class<BTNewScope>();
-		ClassDB::register_class<BTSubtree>();
-		ClassDB::register_class<BTConsolePrint>();
+		GDREGISTER_CLASS(BTAction);
+		GDREGISTER_CLASS(BTFail);
+		GDREGISTER_CLASS(BTWait);
+		GDREGISTER_CLASS(BTRandomWait);
+		GDREGISTER_CLASS(BTWaitTicks);
+		GDREGISTER_CLASS(BTNewScope);
+		GDREGISTER_CLASS(BTSubtree);
+		GDREGISTER_CLASS(BTConsolePrint);
 
-		ClassDB::register_class<BTCondition>();
+		GDREGISTER_CLASS(BTCondition);
 
-		ClassDB::register_abstract_class<BBParam>();
-		ClassDB::register_class<BBInt>();
-		ClassDB::register_class<BBBool>();
-		ClassDB::register_class<BBFloat>();
-		ClassDB::register_class<BBString>();
-		ClassDB::register_class<BBVector2>();
-		ClassDB::register_class<BBRect2>();
-		ClassDB::register_class<BBVector3>();
-		ClassDB::register_class<BBTransform2D>();
-		ClassDB::register_class<BBPlane>();
-		ClassDB::register_class<BBQuat>();
-		ClassDB::register_class<BBAabb>();
-		ClassDB::register_class<BBBasis>();
-		ClassDB::register_class<BBTransform>();
-		ClassDB::register_class<BBColor>();
-		ClassDB::register_class<BBNode>();
-		ClassDB::register_class<BBDictionary>();
-		ClassDB::register_class<BBArray>();
-		ClassDB::register_class<BBByteArray>();
-		ClassDB::register_class<BBIntArray>();
-		ClassDB::register_class<BBRealArray>();
-		ClassDB::register_class<BBColorArray>();
-		ClassDB::register_class<BBStringArray>();
-		ClassDB::register_class<BBVector2Array>();
-		ClassDB::register_class<BBVector3Array>();
-		ClassDB::register_class<BBVariant>();
+		GDREGISTER_ABSTRACT_CLASS(BBParam);
+		GDREGISTER_CLASS(BBInt);
+		GDREGISTER_CLASS(BBBool);
+		GDREGISTER_CLASS(BBFloat);
+		GDREGISTER_CLASS(BBString);
+		GDREGISTER_CLASS(BBVector2);
+		GDREGISTER_CLASS(BBRect2);
+		GDREGISTER_CLASS(BBVector3);
+		GDREGISTER_CLASS(BBTransform2D);
+		GDREGISTER_CLASS(BBPlane);
+		GDREGISTER_CLASS(BBQuat);
+		GDREGISTER_CLASS(BBAabb);
+		GDREGISTER_CLASS(BBBasis);
+		GDREGISTER_CLASS(BBTransform);
+		GDREGISTER_CLASS(BBColor);
+		GDREGISTER_CLASS(BBNode);
+		GDREGISTER_CLASS(BBDictionary);
+		GDREGISTER_CLASS(BBArray);
+		GDREGISTER_CLASS(BBByteArray);
+		GDREGISTER_CLASS(BBIntArray);
+		GDREGISTER_CLASS(BBRealArray);
+		GDREGISTER_CLASS(BBColorArray);
+		GDREGISTER_CLASS(BBStringArray);
+		GDREGISTER_CLASS(BBVector2Array);
+		GDREGISTER_CLASS(BBVector3Array);
+		GDREGISTER_CLASS(BBVariant);
 
 		_limbo_utility = memnew(LimboUtility);
-		ClassDB::register_class<LimboUtility>();
+		GDREGISTER_CLASS(LimboUtility);
 
 		LimboStringNames::create();
 	}