diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index ccf77c08e1..682616afb8 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Services.Interfaces
         /// </summary>
         /// <param name="userID"></param>
         /// <returns></returns>
-        IAvatarData GetAvatar(UUID userID);
+        AvatarData GetAvatar(UUID userID);
 
         /// <summary>
         /// Called by everyone who can change the avatar data (so, regions)
@@ -49,7 +49,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="userID"></param>
         /// <param name="avatar"></param>
         /// <returns></returns>
-        bool SetAvatar(UUID userID, IAvatarData avatar);
+        bool SetAvatar(UUID userID, AvatarData avatar);
 
         /// <summary>
         /// Not sure if it's needed
@@ -91,6 +91,11 @@ namespace OpenSim.Services.Interfaces
         public int AvatarType;
         public Dictionary<string,string> Data;
 
+        public AvatarData(Dictionary<string, object> kvp)
+        {
+            // TODO
+        }
+
         /// <summary>
         /// </summary>
         /// <returns></returns>