diff --git a/entities/ai/entity_ai.cpp b/entities/ai/entity_ai.cpp
index 944dde6..9228fa8 100644
--- a/entities/ai/entity_ai.cpp
+++ b/entities/ai/entity_ai.cpp
@@ -399,10 +399,10 @@ void EntityAI::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_on_set_owner"), &EntityAI::_on_set_owner);
 
 	//EventHandlers
-	D_METHOD("_notification_saura", "what", "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData");
-	D_METHOD("_notification_sheal", "what", "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo");
-	D_METHOD("_notification_scast", "what", "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo");
-	D_METHOD("_notification_sdamage", "what", "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo");
+	D_METHOD("_notification_saura", "what", "data", "AuraData");
+	D_METHOD("_notification_sheal", "what", "info", "SpellHealInfo");
+	D_METHOD("_notification_scast", "what", "info", "SpellCastInfo");
+	D_METHOD("_notification_sdamage", "what", "info", "SpellDamageInfo");
 
 	ClassDB::bind_method(D_METHOD("notification_saura", "what", "data"), &EntityAI::notification_saura);
 	ClassDB::bind_method(D_METHOD("notification_sheal", "what", "info"), &EntityAI::notification_sheal);
@@ -426,7 +426,7 @@ void EntityAI::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("notification_sentity_resource_added", "resource"), &EntityAI::notification_sentity_resource_added);
 	ClassDB::bind_method(D_METHOD("notification_sentity_resource_removed", "resource"), &EntityAI::notification_sentity_resource_removed);
 
-	D_METHOD("_notification_sdeath", "data", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
+	D_METHOD("_notification_sdeath", "data", "Entity");
 
 	D_METHOD("_notification_scooldown_added", "id", "value");
 	D_METHOD("_notification_scooldown_removed", "id", "value");
@@ -434,23 +434,23 @@ void EntityAI::_bind_methods() {
 	D_METHOD("_notification_scategory_cooldown_added", "id", "value");
 	D_METHOD("_notification_scategory_cooldown_removed", "id", "value");
 
-	D_METHOD("_notification_sgcd_started", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "gcd");
-	D_METHOD("_notification_sgcd_finished", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
+	D_METHOD("_notification_sgcd_started", "entity", "Entity", "gcd");
+	D_METHOD("_notification_sgcd_finished", "entity", "Entity");
 
-	D_METHOD("_notification_sxp_gained", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "value");
-	D_METHOD("_notification_slevel_up", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "value");
+	D_METHOD("_notification_sxp_gained", "entity", "Entity", "value");
+	D_METHOD("_notification_slevel_up", "entity", "Entity", "value");
 
-	D_METHOD("_notification_sentity_resource_added", "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource");
-	D_METHOD("_notification_sentity_resource_removed", "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource");
+	D_METHOD("_notification_sentity_resource_added", "resource", "EntityResource");
+	D_METHOD("_notification_sentity_resource_removed", "resource", "EntityResource");
 
 	//Equipment
 
-	D_METHOD("_equip_should_deny", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance");
+	D_METHOD("_equip_should_deny", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "equip_slot", "item", "ItemInstance");
 
-	D_METHOD("_equip_son_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "bag_slot");
-	D_METHOD("_equip_son_fail", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "bag_slot");
-	D_METHOD("_equip_con_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "bag_slot");
-	D_METHOD("_equip_con_fail", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "bag_slot");
+	D_METHOD("_equip_son_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
+	D_METHOD("_equip_son_fail", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
+	D_METHOD("_equip_con_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
+	D_METHOD("_equip_con_fail", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
 
 	ClassDB::bind_method(D_METHOD("equip_should_deny", "entity", "equip_slot", "item"), &EntityAI::equip_should_deny_bind);
 
diff --git a/entities/data/entity_class_data.cpp b/entities/data/entity_class_data.cpp
index 45ba077..4e70b81 100644
--- a/entities/data/entity_class_data.cpp
+++ b/entities/data/entity_class_data.cpp
@@ -378,7 +378,7 @@ EntityClassData::~EntityClassData() {
 }
 
 void EntityClassData::_bind_methods() {
-	D_METHOD("_setup_resources", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
+	D_METHOD("_setup_resources", "entity", "Entity");
 
 	ClassDB::bind_method(D_METHOD("get_id"), &EntityClassData::get_id);
 	ClassDB::bind_method(D_METHOD("set_id", "value"), &EntityClassData::set_id);
diff --git a/entities/data/entity_data.cpp b/entities/data/entity_data.cpp
index 1b02e2b..d8ff1eb 100644
--- a/entities/data/entity_data.cpp
+++ b/entities/data/entity_data.cpp
@@ -265,8 +265,8 @@ void EntityData::_validate_property(PropertyInfo &property) const {
 
 void EntityData::_bind_methods() {
 	//Interactions
-	D_METHOD("_cans_interact", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
-	D_METHOD("_sinteract", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
+	D_METHOD("_cans_interact", "entity", "Entity");
+	D_METHOD("_sinteract", "entity", "Entity");
 
 	ClassDB::bind_method(D_METHOD("cans_interact", "entity"), &EntityData::cans_interact_bind);
 	ClassDB::bind_method(D_METHOD("sinteract", "entity"), &EntityData::sinteract_bind);
diff --git a/entities/entity.cpp b/entities/entity.cpp
index 3842171..8b4758e 100644
--- a/entities/entity.cpp
+++ b/entities/entity.cpp
@@ -6837,11 +6837,11 @@ void Entity::_bind_methods() {
 	D_METHOD("_notification_sxp_gained", "value");
 	D_METHOD("_notification_slevel_up", "value");
 
-	D_METHOD("_notification_sentity_resource_added", "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource");
-	D_METHOD("_notification_sentity_resource_removed", "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource");
+	D_METHOD("_notification_sentity_resource_added", "resource", "EntityResource");
+	D_METHOD("_notification_sentity_resource_removed", "resource", "EntityResource");
 
-	D_METHOD("_son_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
-	D_METHOD("_con_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
+	D_METHOD("_son_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
+	D_METHOD("_con_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
 
 	//Serverside
 	ADD_SIGNAL(MethodInfo("notification_sdamage", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
@@ -6849,10 +6849,10 @@ void Entity::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("notification_scast", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "spell_cast_info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
 	ADD_SIGNAL(MethodInfo("notification_saura", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "aura_data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 
-	D_METHOD("_notification_saura", "what", "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData");
-	D_METHOD("_notification_sheal", "what", "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo");
-	D_METHOD("_notification_scast", "what", "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo");
-	D_METHOD("_notification_sdamage", "what", "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo");
+	D_METHOD("_notification_saura", "what", "data", "AuraData");
+	D_METHOD("_notification_sheal", "what", "info", "SpellHealInfo");
+	D_METHOD("_notification_scast", "what", "info", "SpellCastInfo");
+	D_METHOD("_notification_sdamage", "what", "info", "SpellDamageInfo");
 
 	ClassDB::bind_method(D_METHOD("notification_saura", "what", "data"), &Entity::notification_saura);
 	ClassDB::bind_method(D_METHOD("notification_sheal", "what", "info"), &Entity::notification_sheal);
@@ -6865,10 +6865,10 @@ void Entity::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("notification_ccast", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "spell_cast_info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
 	ADD_SIGNAL(MethodInfo("notification_caura", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "aura_data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 
-	D_METHOD("_notification_caura", "what", "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData");
-	D_METHOD("_notification_cheal", "what", "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo");
-	D_METHOD("_notification_ccast", "what", "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo");
-	D_METHOD("_notification_cdamage", "what", "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo");
+	D_METHOD("_notification_caura", "what", "data", "AuraData");
+	D_METHOD("_notification_cheal", "what", "info", "SpellHealInfo");
+	D_METHOD("_notification_ccast", "what", "info", "SpellCastInfo");
+	D_METHOD("_notification_cdamage", "what", "info", "SpellDamageInfo");
 
 	ClassDB::bind_method(D_METHOD("notification_caura", "what", "data"), &Entity::notification_caura);
 	ClassDB::bind_method(D_METHOD("notification_cheal", "what", "info"), &Entity::notification_cheal);
@@ -7021,8 +7021,8 @@ void Entity::_bind_methods() {
 	D_METHOD("_notification_cxp_gained", "value");
 	D_METHOD("_notification_clevel_up", "value");
 
-	D_METHOD("_notification_centity_resource_added", "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource");
-	D_METHOD("_notification_centity_resource_removed", "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource");
+	D_METHOD("_notification_centity_resource_added", "resource", "EntityResource");
+	D_METHOD("_notification_centity_resource_removed", "resource", "EntityResource");
 
 	D_METHOD("_canc_interact");
 	D_METHOD("_cans_interact");
@@ -7218,8 +7218,8 @@ void Entity::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "cseed", PROPERTY_HINT_NONE, "", 0), "setc_seed", "getc_seed");
 
 	//Interaction type
-	D_METHOD("_gets_relation_to", "to", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
-	D_METHOD("_getc_relation_to", "to", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
+	D_METHOD("_gets_relation_to", "to", "Entity");
+	D_METHOD("_getc_relation_to", "to", "Entity");
 
 	ClassDB::bind_method(D_METHOD("gets_relation_to", "to"), &Entity::gets_relation_to_bind);
 	ClassDB::bind_method(D_METHOD("_gets_relation_to", "to"), &Entity::_gets_relation_to);
@@ -7307,12 +7307,12 @@ void Entity::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("equip_con_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"), PropertyInfo(Variant::OBJECT, "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"), PropertyInfo(Variant::INT, "bag_slot")));
 	ADD_SIGNAL(MethodInfo("equip_con_fail", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"), PropertyInfo(Variant::OBJECT, "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"), PropertyInfo(Variant::INT, "bag_slot")));
 
-	D_METHOD("_equip_should_deny", "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance");
+	D_METHOD("_equip_should_deny", "equip_slot", "item", "ItemInstance");
 
-	D_METHOD("_equip_son_success", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "bag_slot");
-	D_METHOD("_equip_son_fail", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "bag_slot");
-	D_METHOD("_equip_con_success", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "bag_slot");
-	D_METHOD("_equip_con_fail", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "bag_slot");
+	D_METHOD("_equip_son_success", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
+	D_METHOD("_equip_son_fail", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
+	D_METHOD("_equip_con_success", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
+	D_METHOD("_equip_con_fail", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
 
 	ADD_SIGNAL(MethodInfo("equipment_changed", PropertyInfo(Variant::INT, "slot")));
 
@@ -7335,13 +7335,13 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("equip_gets_slot", "index"), &Entity::equip_gets_slot);
 	ClassDB::bind_method(D_METHOD("equip_getc_slot", "index"), &Entity::equip_getc_slot);
 
-	D_METHOD("_equip_can_equip_item", "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance");
+	D_METHOD("_equip_can_equip_item", "equip_slot", "item", "ItemInstance");
 
 	ClassDB::bind_method(D_METHOD("equip_can_equip_item", "equip_slot", "item"), &Entity::equip_can_equip_item);
 	ClassDB::bind_method(D_METHOD("_equip_can_equip_item", "equip_slot", "item"), &Entity::_equip_can_equip_item);
 
-	D_METHOD("_equip_applys_item", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance");
-	D_METHOD("_equip_deapplys_item", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance");
+	D_METHOD("_equip_applys_item", "item", "ItemInstance");
+	D_METHOD("_equip_deapplys_item", "item", "ItemInstance");
 
 	ClassDB::bind_method(D_METHOD("equip_applys_item", "item"), &Entity::equip_applys_item);
 	ClassDB::bind_method(D_METHOD("equip_deapplys_item", "item"), &Entity::equip_deapplys_item);
@@ -7349,8 +7349,8 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_equip_applys_item", "item"), &Entity::_equip_applys_item);
 	ClassDB::bind_method(D_METHOD("_equip_deapplys_item", "item"), &Entity::_equip_deapplys_item);
 
-	D_METHOD("_equip_applyc_item", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance");
-	D_METHOD("_equip_deapplyc_item", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance");
+	D_METHOD("_equip_applyc_item", "item", "ItemInstance");
+	D_METHOD("_equip_deapplyc_item", "item", "ItemInstance");
 
 	ClassDB::bind_method(D_METHOD("cequip_applys_item", "item"), &Entity::equip_applyc_item);
 	ClassDB::bind_method(D_METHOD("equip_deapplyc_item", "item"), &Entity::equip_deapplyc_item);
diff --git a/entities/resources/entity_resource.cpp b/entities/resources/entity_resource.cpp
index a331d1f..39d920d 100644
--- a/entities/resources/entity_resource.cpp
+++ b/entities/resources/entity_resource.cpp
@@ -438,11 +438,11 @@ void EntityResource::_bind_methods() {
 	D_METHOD("_notification_sstat_changed", "statid", "curent");
 	D_METHOD("_notification_cstat_changed", "statid", "curent");
 
-	D_METHOD("_ons_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
-	D_METHOD("_onc_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
+	D_METHOD("_ons_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
+	D_METHOD("_onc_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
 
-	D_METHOD("_ons_added", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
-	D_METHOD("_onc_added", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity");
+	D_METHOD("_ons_added", "entity", "Entity");
+	D_METHOD("_onc_added", "entity", "Entity");
 
 	D_METHOD("_process_server", "delta");
 	D_METHOD("_process_client", "delta");
diff --git a/material_cache/ess_material_cache.cpp b/material_cache/ess_material_cache.cpp
index 91d4fe0..03cc9f0 100644
--- a/material_cache/ess_material_cache.cpp
+++ b/material_cache/ess_material_cache.cpp
@@ -336,7 +336,7 @@ void ESSMaterialCache::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("inc_ref_count"), &ESSMaterialCache::inc_ref_count);
 	ClassDB::bind_method(D_METHOD("dec_ref_count"), &ESSMaterialCache::dec_ref_count);
 
-	D_METHOD("_setup_material_albedo", "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture");
+	D_METHOD("_setup_material_albedo", "texture", "Texture");
 
 	ClassDB::bind_method(D_METHOD("material_get", "index"), &ESSMaterialCache::material_get);
 	ClassDB::bind_method(D_METHOD("material_lod_get", "index"), &ESSMaterialCache::material_lod_get);
diff --git a/register_types.cpp b/register_types.cpp
index a607fe8..4e3a6a5 100644
--- a/register_types.cpp
+++ b/register_types.cpp
@@ -140,7 +140,7 @@ SOFTWARE.
 static ESS *entity_data_manager = NULL;
 static ProfileManager *profile_manager = NULL;
 
-void initialize_entity_spell_system_module(ModuleInitializationLevel p_level) {
+void initialize_entity_spell_system_module(GDNativeInitializationLevel p_level) {
 #if PROPS_PRESENT
 	ClassDB::register_class<PropDataEntity>();
 #endif
@@ -280,7 +280,7 @@ void initialize_entity_spell_system_module(ModuleInitializationLevel p_level) {
 #endif
 }
 
-void uninitialize_entity_spell_system_module(ModuleInitializationLevel p_level) {
+void uninitialize_entity_spell_system_module(GDNativeInitializationLevel p_level) {
 	if (entity_data_manager) {
 		memdelete(entity_data_manager);
 	}
diff --git a/spawners/ess_entity_spawner.cpp b/spawners/ess_entity_spawner.cpp
index 4b58a18..2678c90 100644
--- a/spawners/ess_entity_spawner.cpp
+++ b/spawners/ess_entity_spawner.cpp
@@ -49,7 +49,7 @@ ESSEntitySpawner::~ESSEntitySpawner() {
 }
 
 void ESSEntitySpawner::_bind_methods() {
-	D_METHOD("_request_entity_spawn", "info", PROPERTY_HINT_RESOURCE_TYPE, "EntityCreateInfo");
+	D_METHOD("_request_entity_spawn", "info", "EntityCreateInfo");
 	ADD_SIGNAL(MethodInfo("on_entity_spawn", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "EntityCreateInfo")));
 
 	ClassDB::bind_method(D_METHOD("request_entity_spawn", "info"), &ESSEntitySpawner::request_entity_spawn);