diff --git a/plugins/include/ns.inc b/plugins/include/ns.inc
index 88a0662c..79605199 100755
--- a/plugins/include/ns.inc
+++ b/plugins/include/ns.inc
@@ -155,11 +155,11 @@ native ns_get_deaths(idPlayer);
 /* Sets a player's death count. */
 native ns_set_deaths(idPlayer,numdeaths);
 
-/* Gets a player's icon value (from the scoreboard) is a bitmask.  Use enum "icons" for values. Returns -1 for unauthed */
-native ns_get_icon(idPlayer);
+/* Gets the index of the owner of a structure. -1 for no owner. */
+native ns_get_struct_owner(idStructsure);
 
-/* Sets a player's icon value. */
-native ns_set_icon(idPlayer,iconvalue);
+/* Sets the index of the owner of a structure. -1 for no owner. */
+native ns_set_struct_owner(idStructure,indexOwner);
 
 /* Gets the trait type tied to the hive.  Look at the hivetrait enum for the values. */
 native ns_get_hive_trait(idHive);
diff --git a/plugins/include/ns_const.inc b/plugins/include/ns_const.inc
index 22887b86..d66f04fe 100755
--- a/plugins/include/ns_const.inc
+++ b/plugins/include/ns_const.inc
@@ -11,8 +11,7 @@
 #define NS_CONST_INC
 
 // entity pev->iuser4 fields
-enum masks
-{
+enum {
 	MASK_NONE = 0,
 	MASK_SIGHTED = 1,
 	MASK_DETECTED = 2,
@@ -67,8 +66,7 @@ enum masks
 }
 
 
-enum classes
-{
+enum {
 	CLASS_UNKNOWN = 0,
 	CLASS_SKULK,
 	CLASS_GORGE,
@@ -84,8 +82,7 @@ enum classes
 	CLASS_NOTEAM
 }
 
-enum weapons
-{
+enum {
 	WEAPON_NONE = 0,
 	WEAPON_CLAWS,
 	WEAPON_SPIT,
@@ -119,20 +116,8 @@ enum weapons
 	WEAPON_DEVOUR,
 	WEAPON_MAX
 }
-enum playerIcons {
-  ICON_DEVELOPER      = 1,
-  ICON_GUIDE          = 2,
-  ICON_SERVEROP       = 4,
-  ICON_PLAYTESTER     = 8,
-  ICON_CONTRIBUTOR    = 16,
-  ICON_CHEATINGDEATH  = 32,
-  ICON_VETERAN        = 64,
-  ICON_BETASERVEROP   = 128, // Using this messes with ICON_SERVEROPs
-  ICON_CUSTOM         = 512
 
-}
-enum hivetraits
-{
+enum {
 	HIVETRAIT_NONE	= 0,
 	HIVETRAIT_DC	= 92,
 	HIVETRAIT_SC	= 93,