diff --git a/VpNet/ManagedApi/Instance.cs b/VpNet/ManagedApi/Instance.cs
index 766f583..f7addbd 100644
--- a/VpNet/ManagedApi/Instance.cs
+++ b/VpNet/ManagedApi/Instance.cs
@@ -1,1779 +1,1775 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using VpNet.Abstract;
-using VpNet.Extensions;
-using VpNet.Interfaces;
-using VpNet.ManagedApi.System;
-using VpNet.NativeApi;
-
-namespace VpNet.ManagedApi
-{
-    /// <summary>
-    /// Abtract fully teamplated instance class, providing .NET encapsulation strict templated types to the native C wrapper.
-    /// </summary>
-    [Serializable]
-    public partial class Instance : IInstance
-    {
-        bool _isInitialized;
-
-        private readonly Dictionary<int, TaskCompletionSource<object>> _objectCompletionSources = new Dictionary<int, TaskCompletionSource<object>>();
-
-        private Dictionary<int, IAvatar> _avatars;
-
-        Dictionary<string, IWorld> _worlds;
-        internal IntPtr _instance;
-        private IUniverse Universe { get; set; }
-        private IWorld World { get; set; }
-        private NetConfig netConfig;
-        private GCHandle instanceHandle;
-        private TaskCompletionSource<object> ConnectCompletionSource;
-        private TaskCompletionSource<object> LoginCompletionSource;
-        private TaskCompletionSource<object> EnterCompletionSource;
-
-        internal void InitOnce()
-        {
-            instanceHandle = GCHandle.Alloc(this);
-            netConfig.Context = GCHandle.ToIntPtr(instanceHandle);
-            netConfig.Create = Connection.CreateNative;
-            netConfig.Destroy = Connection.DestroyNative;
-            netConfig.Connect = Connection.ConnectNative;
-            netConfig.Receive = Connection.ReceiveNative;
-            netConfig.Send = Connection.SendNative;
-            netConfig.Timeout = Connection.TimeoutNative;
-
-            OnChatNativeEvent += OnChatNative;
-            OnAvatarAddNativeEvent += OnAvatarAddNative;
-            OnAvatarChangeNativeEvent += OnAvatarChangeNative;
-            OnAvatarDeleteNativeEvent += OnAvatarDeleteNative;
-            OnAvatarClickNativeEvent += OnAvatarClickNative;
-            OnWorldListNativeEvent += OnWorldListNative;
-            OnWorldDisconnectNativeEvent += OnWorldDisconnectNative;
-
-            OnObjectChangeNativeEvent += OnObjectChangeNative;
-            OnObjectCreateNativeEvent += OnObjectCreateNative;
-            OnObjectClickNativeEvent += OnObjectClickNative;
-            OnObjectBumpNativeEvent += OnObjectBumpNative;
-            OnObjectBumpEndNativeEvent += OnObjectBumpEndNative;
-            OnObjectDeleteNativeEvent += OnObjectDeleteNative;
-
-            OnQueryCellEndNativeEvent += OnQueryCellEndNative;
-            OnUniverseDisconnectNativeEvent += OnUniverseDisconnectNative;
-            OnTeleportNativeEvent += OnTeleportNative;
-            OnUserAttributesNativeEvent += OnUserAttributesNative;
-            OnJoinNativeEvent += OnJoinNative;
-
-            OnObjectCreateCallbackNativeEvent += OnObjectCreateCallbackNative;
-            OnObjectChangeCallbackNativeEvent += OnObjectChangeCallbackNative;
-            OnObjectDeleteCallbackNativeEvent += OnObjectDeleteCallbackNative;
-            OnObjectGetCallbackNativeEvent += OnObjectGetCallbackNative;
-            this.OnObjectLoadCallbackNativeEvent += this.OnObjectLoadCallbackNative;
-
-            OnFriendAddCallbackNativeEvent += OnFriendAddCallbackNative;
-            OnFriendDeleteCallbackNativeEvent += OnFriendDeleteCallbackNative;
-            OnGetFriendsCallbackNativeEvent += OnGetFriendsCallbackNative;
-        }
-
-        public Instance()
-        {
-            Universe = new Universe();
-            Configuration = new InstanceConfiguration();
-            _worlds = new Dictionary<string, IWorld>();
-            _avatars = new Dictionary<int, IAvatar>();
-            InitOnce();
-            InitVpNative();
-        }
-
-
-        private void InitVpNative()
-        {
-               
-            int rc = Functions.vp_init(5);
-            if (rc != 0)
-            {
-                throw new VpException((ReasonCode)rc);
-            }
-
-            _instance = Functions.vp_create(ref netConfig);
-
-            SetNativeEvent(Events.Chat, OnChatNative1);
-            SetNativeEvent(Events.AvatarAdd, OnAvatarAddNative1);
-            SetNativeEvent(Events.AvatarChange, OnAvatarChangeNative1);
-            SetNativeEvent(Events.AvatarDelete, OnAvatarDeleteNative1);
-            SetNativeEvent(Events.AvatarClick, OnAvatarClickNative1);
-            SetNativeEvent(Events.WorldList, OnWorldListNative1);
-            SetNativeEvent(Events.WorldSetting, OnWorldSettingNative1);
-            SetNativeEvent(Events.WorldSettingsChanged, OnWorldSettingsChangedNative1);
-            SetNativeEvent(Events.ObjectChange, OnObjectChangeNative1);
-            SetNativeEvent(Events.Object, OnObjectCreateNative1);
-            SetNativeEvent(Events.ObjectClick, OnObjectClickNative1);
-            SetNativeEvent(Events.ObjectBumpBegin, OnObjectBumpNative1);
-            SetNativeEvent(Events.ObjectBumpEnd, OnObjectBumpEndNative1);
-            SetNativeEvent(Events.ObjectDelete, OnObjectDeleteNative1);
-            SetNativeEvent(Events.QueryCellEnd, OnQueryCellEndNative1);
-            SetNativeEvent(Events.UniverseDisconnect, OnUniverseDisconnectNative1);
-            SetNativeEvent(Events.WorldDisconnect, OnWorldDisconnectNative1);
-            SetNativeEvent(Events.Teleport, OnTeleportNative1);
-            SetNativeEvent(Events.UserAttributes, OnUserAttributesNative1);
-            SetNativeEvent(Events.Join, OnJoinNative1);
-            SetNativeCallback(Callbacks.ObjectAdd, OnObjectCreateCallbackNative1);
-            SetNativeCallback(Callbacks.ObjectChange, OnObjectChangeCallbackNative1);
-            SetNativeCallback(Callbacks.ObjectDelete, OnObjectDeleteCallbackNative1);
-            SetNativeCallback(Callbacks.ObjectGet, OnObjectGetCallbackNative1);
-            SetNativeCallback(Callbacks.ObjectLoad, this.OnObjectLoadCallbackNative1);
-            SetNativeCallback(Callbacks.FriendAdd, OnFriendAddCallbackNative1);
-            SetNativeCallback(Callbacks.FriendDelete, OnFriendDeleteCallbackNative1);
-            SetNativeCallback(Callbacks.GetFriends, OnGetFriendsCallbackNative1);
-            SetNativeCallback(Callbacks.Login, OnLoginCallbackNative1);
-            SetNativeCallback(Callbacks.Enter, OnEnterCallbackNativeEvent1);
-            //SetNativeCallback(Callbacks.Join, OnJoinCallbackNativeEvent1);
-            SetNativeCallback(Callbacks.ConnectUniverse, OnConnectUniverseCallbackNative1);
-            //SetNativeCallback(Callbacks.WorldPermissionUserSet, OnWorldPermissionUserSetCallbackNative1);
-            //SetNativeCallback(Callbacks.WorldPermissionSessionSet, OnWorldPermissionSessionSetCallbackNative1);
-            //SetNativeCallback(Callbacks.WorldSettingSet, OnWorldSettingsSetCallbackNative1);
-        }
-
-        internal void OnObjectCreateCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnObjectCreateCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnObjectChangeCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnObjectChangeCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnObjectDeleteCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnObjectDeleteCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnObjectGetCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnObjectGetCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnFriendAddCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnFriendAddCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnFriendDeleteCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnFriendDeleteCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnGetFriendsCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnFriendDeleteCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnObjectLoadCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnObjectLoadCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnLoginCallbackNative1(IntPtr instance, int rc, int reference)
-        {
-            lock (this)
-            {
-                SetCompletionResult(LoginCompletionSource, rc, null);
-            }
-        }
-        internal void OnEnterCallbackNativeEvent1(IntPtr instance, int rc, int reference)
-        {
-            lock (this)
-            {
-                SetCompletionResult(EnterCompletionSource, rc, null);
-                OnWorldEnter?.Invoke(this, new WorldEnterEventArgs() { World = World });
-            }
-        }
-        internal void OnJoinCallbackNativeEvent1(IntPtr instance, int rc, int reference) { lock (this) { OnJoinCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnConnectUniverseCallbackNative1(IntPtr instance, int rc, int reference)
-        {
-            lock (this)
-            {
-                SetCompletionResult(ConnectCompletionSource, rc, null);
-            }
-        }
-        internal void OnWorldPermissionUserSetCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnWorldPermissionUserSetCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnWorldPermissionSessionSetCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnWorldPermissionSessionSetCallbackNativeEvent(instance, rc, reference); } }
-        internal void OnWorldSettingsSetCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnWorldSettingsSetCallbackNativeEvent(instance, rc, reference); } }
-
-
-
-        internal void OnChatNative1(IntPtr instance) { lock (this) { OnChatNativeEvent(instance); } }
-        internal void OnAvatarAddNative1(IntPtr instance) { lock (this) { OnAvatarAddNativeEvent(instance); } }
-        internal void OnAvatarChangeNative1(IntPtr instance) { lock (this) { OnAvatarChangeNativeEvent(instance); } }
-        internal void OnAvatarDeleteNative1(IntPtr instance) { lock (this) { OnAvatarDeleteNativeEvent(instance); } }
-        internal void OnAvatarClickNative1(IntPtr instance) { lock (this) { OnAvatarClickNativeEvent(instance); } }
-        internal void OnWorldListNative1(IntPtr instance) { lock (this) { OnWorldListNativeEvent(instance); } }
-        internal void OnWorldDisconnectNative1(IntPtr instance) { lock (this) { OnWorldDisconnectNativeEvent(instance); } }
-        internal void OnWorldSettingsChangedNative1(IntPtr instance) { lock (this) { OnWorldSettingsChangedNativeEvent(instance); } }
-        internal void OnWorldSettingNative1(IntPtr instance) { lock (this) { OnWorldSettingNativeEvent(instance); } }
-        internal void OnObjectChangeNative1(IntPtr instance) { lock (this) { OnObjectChangeNativeEvent(instance); } }
-        internal void OnObjectCreateNative1(IntPtr instance) { lock (this) { OnObjectCreateNativeEvent(instance); } }
-        internal void OnObjectClickNative1(IntPtr instance) { lock (this) { OnObjectClickNativeEvent(instance); } }
-        internal void OnObjectBumpNative1(IntPtr instance) { lock (this) { OnObjectBumpNativeEvent(instance); } }
-        internal void OnObjectBumpEndNative1(IntPtr instance) { lock (this) { OnObjectBumpEndNativeEvent(instance); } }
-        internal void OnObjectDeleteNative1(IntPtr instance) { lock (this) { OnObjectDeleteNativeEvent(instance); } }
-        internal void OnQueryCellEndNative1(IntPtr instance) { lock (this) { OnQueryCellEndNativeEvent(instance); } }
-        internal void OnUniverseDisconnectNative1(IntPtr instance) { lock (this) { OnUniverseDisconnectNativeEvent(instance); } }
-        internal void OnTeleportNative1(IntPtr instance) { lock (this) { OnTeleportNativeEvent(instance); } }
-        internal void OnUserAttributesNative1(IntPtr instance) { lock (this){OnUserAttributesNativeEvent(instance);} }
-        internal void OnJoinNative1(IntPtr instance) { lock (this) { OnJoinNativeEvent(instance); } }
-
-        #region Methods
-
-        private void SetCompletionResult(int referenceNumber, int rc, object result)
-        {
-            var tcs = _objectCompletionSources[referenceNumber];
-            SetCompletionResult(tcs, rc, result);
-        }
-
-        private static void SetCompletionResult(TaskCompletionSource<object> tcs, int rc, object result)
-        {
-            if (rc != 0)
-            {
-                tcs.SetException(new VpException((ReasonCode)rc));
-            }
-            else
-            {
-                tcs.SetResult(result);
-            }
-        }
-
-        private static void CheckReasonCode(int rc)
-        {
-            if (rc != 0)
-            {
-                throw new VpException((ReasonCode)rc);
-            }
-        }
-
-        #region IUniverseFunctions Implementations
-
-        virtual public Task ConnectAsync(string host = "universe.virtualparadise.org", ushort port = 57000)
-        {
-            Universe.Host = host;
-            Universe.Port = port;
-
-            lock (this)
-            {
-                ConnectCompletionSource = new TaskCompletionSource<object>();
-                var rc = Functions.vp_connect_universe(_instance, host, port);
-                if (rc != 0)
-                {
-                    return Task.FromException(new VpException((ReasonCode)rc));
-                }
-                return ConnectCompletionSource.Task;
-            }
-        }
-
-        virtual public async Task LoginAndEnterAsync(bool announceAvatar = true)
-        {
-            await ConnectAsync();
-            await LoginAsync();
-            await EnterAsync();
-            if (announceAvatar)
-            {
-                UpdateAvatar();
-            }
-        }
-
-        virtual public async Task LoginAsync()
-        {
-            if (Configuration == null ||
-                string.IsNullOrEmpty(Configuration.BotName) ||
-                string.IsNullOrEmpty(Configuration.Password) ||
-                string.IsNullOrEmpty(Configuration.UserName)
-                )
-            {
-                throw new ArgumentException("Can't login because of Incomplete login configuration.");
-            }
-
-            await LoginAsync(Configuration.UserName, Configuration.Password, Configuration.BotName);
-        }
-
-        virtual public Task LoginAsync(string username, string password, string botname)
-        {
-            lock (this)
-            {
-                Configuration.BotName = botname;
-                Configuration.UserName = username;
-                Configuration.Password = password;
-                Functions.vp_string_set(_instance, StringAttribute.ApplicationName, Configuration.ApplicationName);
-                Functions.vp_string_set(_instance, StringAttribute.ApplicationVersion, Configuration.ApplicationVersion);
-
-                LoginCompletionSource = new TaskCompletionSource<object>();
-                var rc = Functions.vp_login(_instance, username, password, botname);
-                if (rc != 0)
-                {
-                    return Task.FromException(new VpException((ReasonCode)rc));
-                }
-
-                return LoginCompletionSource.Task;
-            }
-        }
-
-        #endregion
-
-        #region IWorldFunctions Implementations
-        [Obsolete("No longer necessary for network IO to occur")]
-        virtual public void Wait(int milliseconds = 10)
-        {
-            Thread.Sleep(milliseconds);
-        }
-
-        virtual public Task EnterAsync(string worldname)
-        {
-            return EnterAsync(new World { Name = worldname });
-        }
-
-        virtual public Task EnterAsync()
-        {
-            if (Configuration == null || Configuration.World == null || string.IsNullOrEmpty(Configuration.World.Name))
-                throw new ArgumentException("Can't login because of Incomplete instance world configuration.");
-            return EnterAsync(Configuration.World);
-        }
-
-        virtual public Task EnterAsync(IWorld world)
-        {
-            lock (this)
-            {
-                Configuration.World = world;
-
-                EnterCompletionSource = new TaskCompletionSource<object>();
-                var rc = Functions.vp_enter(_instance, world.Name);
-                if (rc != 0)
-                {
-                    return Task.FromException(new VpException((ReasonCode)rc));
-                }
-
-                return EnterCompletionSource.Task;
-            }
-        }
-
-        virtual public IAvatar My()
-        {
-            return new Avatar
-            {
-                UserId = Functions.vp_int(_instance, IntegerAttribute.MyUserId),
-                Name = Configuration.BotName,
-                AvatarType = Functions.vp_int(_instance, IntegerAttribute.MyType),
-                Position = new Vector3
-                {
-                    X = Functions.vp_double(_instance, FloatAttribute.MyX),
-                    Y = Functions.vp_double(_instance, FloatAttribute.MyY),
-                    Z = Functions.vp_double(_instance, FloatAttribute.MyZ)
-                },
-                Rotation = new Vector3
-                {
-                    X = Functions.vp_double(_instance, FloatAttribute.MyPitch),
-                    Y = Functions.vp_double(_instance, FloatAttribute.MyYaw),
-                    Z = 0 /* roll currently not supported*/
-                },
-                LastChanged = DateTime.Now
-            };
-        }
-
-        /// <summary>
-        /// Leave the current world
-        /// </summary>
-        virtual public void Leave()
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_leave(_instance));
-                OnWorldLeave?.Invoke(this, new WorldLeaveEventArgs { World = Configuration.World });
-            }
-        }
-
-        virtual public void Disconnect()
-        {
-            _avatars.Clear();
-            Functions.vp_destroy(_instance);
-            _isInitialized = false;
-            InitVpNative();
-            OnUniverseDisconnect?.Invoke(this, new UniverseDisconnectEventArgs { Universe = Universe, DisconnectType = VpNet.DisconnectType.UserDisconnected });
-        }
-
-        virtual public void ListWorlds()
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_list(_instance, 0));
-            }
-        }
-
-        #endregion
-
-        #region IQueryCellFunctions Implementation
-
-        virtual public void QueryCell(int cellX, int cellZ)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_query_cell(_instance, cellX, cellZ));
-            }
-        }
-
-        virtual public void QueryCell(int cellX, int cellZ, int revision)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_query_cell_revision(_instance, cellX, cellZ, revision));
-            }
-        }
-
-        #endregion
-
-        #region IVpObjectFunctions implementations
-
-        public void ClickObject(IVpObject vpObject)
-        {
-            lock (this)
-            {
-                ClickObject(vpObject.Id);
-            }
-        }
-
-        public void ClickObject(int objectId)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_object_click(_instance, objectId, 0, 0, 0, 0));
-            }
-        }
-
-        public void ClickObject(IVpObject vpObject, IAvatar avatar)
-        {
-            lock (this)
-            {
-                ClickObject(vpObject.Id, avatar.Session);
-            }
-        }
-
-        public void ClickObject(IVpObject vpObject, IAvatar avatar, Vector3 worldHit)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_object_click(_instance, vpObject.Id, avatar.Session, (float)worldHit.X, (float)worldHit.Y, (float)worldHit.Z));
-            }
-        }
-
-        public void ClickObject(IVpObject vpObject, Vector3 worldHit)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_object_click(_instance, vpObject.Id, 0, (float)worldHit.X, (float)worldHit.Y, (float)worldHit.Z));
-            }
-        }
-
-        public void ClickObject(int objectId,int toSession, double worldHitX, double worldHitY, double worldHitZ)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_object_click(_instance, objectId, toSession, (float)worldHitX, (float)worldHitY, (float)worldHitZ));
-            }
-        }
-
-        public void ClickObject(int objectId, double worldHitX, double worldHitY, double worldHitZ)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_object_click(_instance, objectId, 0, (float)worldHitX, (float)worldHitY, (float)worldHitZ));
-            }
-        }
-
-        public void ClickObject(int objectId, int toSession)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_object_click(_instance, objectId, toSession, 0, 0, 0));
-            }
-        }
-
-        virtual public Task DeleteObjectAsync(IVpObject vpObject)
-        {
-            var referenceNumber = ObjectReferenceCounter.GetNextReference();
-            var tcs = new TaskCompletionSource<object>();
-            lock (this)
-            {
-                _objectCompletionSources.Add(referenceNumber, tcs);
-                Functions.vp_int_set(_instance, IntegerAttribute.ReferenceNumber, referenceNumber);
-
-                int rc = Functions.vp_object_delete(_instance,vpObject.Id);
-                if (rc != 0)
-                {
-                    _objectCompletionSources.Remove(referenceNumber);
-                    throw new VpException((ReasonCode)rc);
-                }
-            }
-
-            return tcs.Task;
-        }
-
-        virtual public async Task<int> LoadObjectAsync(IVpObject vpObject)
-        {
-            var referenceNumber = ObjectReferenceCounter.GetNextReference();
-            var tcs = new TaskCompletionSource<object>();
-            lock (this)
-            {
-                _objectCompletionSources.Add(referenceNumber, tcs);
-                Functions.vp_int_set(_instance, IntegerAttribute.ReferenceNumber, referenceNumber);
-                Functions.vp_int_set(_instance, IntegerAttribute.ObjectId, vpObject.Id);
-                Functions.vp_string_set(_instance, StringAttribute.ObjectAction, vpObject.Action);
-                Functions.vp_string_set(_instance, StringAttribute.ObjectDescription, vpObject.Description);
-                Functions.vp_string_set(_instance, StringAttribute.ObjectModel, vpObject.Model);
-                Functions.SetData(_instance, DataAttribute.ObjectData, vpObject.Data);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationX, vpObject.Rotation.X);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationY, vpObject.Rotation.Y);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationZ, vpObject.Rotation.Z);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectX, vpObject.Position.X);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectY, vpObject.Position.Y);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectZ, vpObject.Position.Z);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationAngle, vpObject.Angle);
-                Functions.vp_int_set(_instance, IntegerAttribute.ObjectType, vpObject.ObjectType);
-                Functions.vp_int_set(_instance, IntegerAttribute.ObjectUserId, vpObject.Owner);
-                Functions.vp_int_set(_instance, IntegerAttribute.ObjectTime, (int)new DateTimeOffset(vpObject.Time).ToUnixTimeSeconds());
-
-                int rc = Functions.vp_object_load(_instance);
-                if (rc != 0)
-                {
-                    _objectCompletionSources.Remove(referenceNumber);
-                    throw new VpException((ReasonCode)rc);
-                }
-            }
-
-            var id = (int)await tcs.Task.ConfigureAwait(false);
-            vpObject.Id = id;
-
-            return id;
-        }
-
-        virtual public async Task<int> AddObjectAsync(IVpObject vpObject)
-        {
-            var referenceNumber = ObjectReferenceCounter.GetNextReference();
-            var tcs = new TaskCompletionSource<object>();
-            lock (this)
-            {
-                _objectCompletionSources.Add(referenceNumber, tcs);
-                Functions.vp_int_set(_instance, IntegerAttribute.ReferenceNumber, referenceNumber);
-                Functions.vp_int_set(_instance, IntegerAttribute.ObjectId, vpObject.Id);
-                Functions.vp_string_set(_instance, StringAttribute.ObjectAction, vpObject.Action);
-                Functions.vp_string_set(_instance, StringAttribute.ObjectDescription, vpObject.Description);
-                Functions.vp_string_set(_instance, StringAttribute.ObjectModel, vpObject.Model);
-                Functions.SetData(_instance, DataAttribute.ObjectData, vpObject.Data);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationX, vpObject.Rotation.X);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationY, vpObject.Rotation.Y);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationZ, vpObject.Rotation.Z);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectX, vpObject.Position.X);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectY, vpObject.Position.Y);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectZ, vpObject.Position.Z);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationAngle, vpObject.Angle);
-                Functions.vp_int_set(_instance, IntegerAttribute.ObjectType, vpObject.ObjectType);
-
-                int rc = Functions.vp_object_add(_instance);
-                if (rc != 0)
-                {
-                    _objectCompletionSources.Remove(referenceNumber);
-                    throw new VpException((ReasonCode)rc);
-                }
-            }
-
-            var id = (int)await tcs.Task.ConfigureAwait(false);
-            vpObject.Id = id;
-
-            return id;
-        }
-
-        virtual public Task ChangeObjectAsync(IVpObject vpObject)
-        {
-            var referenceNumber = ObjectReferenceCounter.GetNextReference();
-            var tcs = new TaskCompletionSource<object>();
-            lock (this)
-            {
-                _objectCompletionSources.Add(referenceNumber, tcs);
-                Functions.vp_int_set(_instance, IntegerAttribute.ReferenceNumber, referenceNumber);
-                Functions.vp_int_set(_instance, IntegerAttribute.ObjectId, vpObject.Id);
-                Functions.vp_string_set(_instance, StringAttribute.ObjectAction, vpObject.Action);
-                Functions.vp_string_set(_instance, StringAttribute.ObjectDescription, vpObject.Description);
-                Functions.vp_string_set(_instance, StringAttribute.ObjectModel, vpObject.Model);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationX, vpObject.Rotation.X);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationY, vpObject.Rotation.Y);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationZ, vpObject.Rotation.Z);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectX, vpObject.Position.X);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectY, vpObject.Position.Y);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectZ, vpObject.Position.Z);
-                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationAngle, vpObject.Angle);
-                Functions.vp_int_set(_instance, IntegerAttribute.ObjectType, vpObject.ObjectType);
-
-                int rc = Functions.vp_object_change(_instance);
-                if (rc != 0)
-                {
-                    _objectCompletionSources.Remove(referenceNumber);
-                    throw new VpException((ReasonCode)rc);
-                }
-            }
-
-
-            return tcs.Task;
-        }
-
-        virtual public async Task<IVpObject> GetObjectAsync(int id)
-        {
-            var referenceNumber = ObjectReferenceCounter.GetNextReference();
-            var tcs = new TaskCompletionSource<object>();
-            lock (this)
-            {
-                _objectCompletionSources.Add(referenceNumber, tcs);
-                Functions.vp_int_set(_instance, IntegerAttribute.ReferenceNumber, referenceNumber);
-                var rc = Functions.vp_object_get(_instance, id);
-                if (rc != 0)
-                {
-                    _objectCompletionSources.Remove(referenceNumber);
-                    throw new VpException((ReasonCode)rc);
-                }
-            }
-
-            var obj = (IVpObject)await tcs.Task.ConfigureAwait(false);
-            return obj;
-        }
-
-        #endregion
-
-        #region ITeleportFunctions Implementations
-
-        virtual public void TeleportAvatar(int targetSession, string world, double x, double y, double z, double yaw, double pitch)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_teleport_avatar(_instance, targetSession, world, (float)x, (float)y,
-                                                             (float)z, (float)yaw, (float)pitch));
-            }
-        }
-
-        virtual public void TeleportAvatar(IAvatar avatar, string world, double x, double y, double z, double yaw, double pitch)
-        {
-            TeleportAvatar(avatar.Session, world, (float)x, (float)y, (float)z, (float)yaw, (float)pitch);
-        }
-
-        virtual public void TeleportAvatar(IAvatar avatar, string world, Vector3 position, double yaw, double pitch)
-        {
-            TeleportAvatar(avatar.Session, world, (float)position.X, (float)position.Y, (float)position.Z, (float)yaw, (float)pitch);
-        }
-
-        virtual public void TeleportAvatar(int targetSession, string world, Vector3 position, double yaw, double pitch)
-        {
-            TeleportAvatar(targetSession, world, (float)position.X, (float)position.Y, (float)position.Z, (float)yaw, (float)pitch);
-
-        }
-
-        virtual public void TeleportAvatar(IAvatar avatar, string world, Vector3 position, Vector3 rotation)
-        {
-            TeleportAvatar(avatar.Session, world, (float)position.X, (float)position.Y, (float)position.Z,
-                           (float)rotation.Y, (float)rotation.X);
-        }
-
-        public void TeleportAvatar(IAvatar avatar, IWorld world, Vector3 position, Vector3 rotation)
-        {
-            TeleportAvatar(avatar.Session, world.Name, (float)position.X, (float)position.Y, (float)position.Z,
-                           (float)rotation.Y, (float)rotation.X);
-        }
-
-        virtual public void TeleportAvatar(IAvatar avatar, Vector3 position, Vector3 rotation)
-        {
-            TeleportAvatar(avatar.Session, string.Empty, (float)position.X, (float)position.Y, (float)position.Z,
-                           (float)rotation.Y, (float)rotation.X);
-        }
-
-        virtual public void TeleportAvatar(IAvatar avatar)
-        {
-            TeleportAvatar(avatar.Session, string.Empty, (float)avatar.Position.X, (float)avatar.Position.Y,
-                           (float)avatar.Position.Z, (float)avatar.Rotation.Y, (float)avatar.Rotation.X);
-        }
-
-        #endregion
-
-        #region IAvatarFunctions Implementations.
-
-        virtual public void GetUserProfile(int userId)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_user_attributes_by_id(_instance, userId));
-            }
-        }
-
-        [Obsolete]
-        virtual public void GetUserProfile(string userName)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_user_attributes_by_name(_instance, userName));
-            }
-        }
-
-        virtual public void GetUserProfile(IAvatar profile)
-        {
-            GetUserProfile(profile.UserId);
-        }
-
-        virtual public void UpdateAvatar(double x = 0.0f, double y = 0.0f, double z = 0.0f,double yaw = 0.0f, double pitch = 0.0f)
-        {
-            lock (this)
-            {
-                Functions.vp_double_set(_instance, FloatAttribute.MyX, x);
-                Functions.vp_double_set(_instance, FloatAttribute.MyY, y);
-                Functions.vp_double_set(_instance, FloatAttribute.MyZ, z);
-                Functions.vp_double_set(_instance, FloatAttribute.MyYaw, yaw);
-                Functions.vp_double_set(_instance, FloatAttribute.MyPitch, pitch);
-                CheckReasonCode(Functions.vp_state_change(_instance));
-
-            }
-        }
-
-        public void UpdateAvatar(Vector3 position)
-        {
-            UpdateAvatar(position.X, position.Y, position.Z);
-        }
-
-        public void UpdateAvatar(Vector3 position, Vector3 rotation)
-        {
-            UpdateAvatar(position.X, position.Y, position.Z, rotation.X, rotation.Y);
-        }
-
-        public void AvatarClick(int session)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_avatar_click(_instance, session));
-            }
-        }
-
-        public void AvatarClick(IAvatar avatar)
-        {
-            AvatarClick(avatar.Session);
-        }
-
-        #endregion
-
-        #region IChatFunctions Implementations
-
-        virtual public void Say(string message)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_say(_instance, message));
-            }
-        }
-
-        virtual public void Say(string format, params object[] arg)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_say(_instance, string.Format(format, arg)));
-            }
-        }
-
-        public void ConsoleMessage(int targetSession, string name, string message, TextEffectTypes effects = 0, byte red = 0, byte green = 0, byte blue = 0)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_console_message(_instance, targetSession, name, message, (int)effects, red, green, blue));
-            }
-        }
-
-        public void ConsoleMessage(IAvatar avatar, string name, string message, Color color, TextEffectTypes effects = 0)
-        {
-            color = color ?? new Color();
-            ConsoleMessage(avatar.Session, name, message, effects, color.R, color.G, color.B);
-        }
-
-        public void ConsoleMessage(int targetSession, string name, string message, Color color, TextEffectTypes effects = 0)
-        {
-            color = color ?? new Color();
-            ConsoleMessage(targetSession, name, message, effects, color.R, color.G, color.B);
-        }
-
-        public void ConsoleMessage(string name, string message, Color color, TextEffectTypes effects = 0)
-        {
-            color = color ?? new Color();
-            ConsoleMessage(0, name, message, effects, color.R, color.G, color.B);
-        }
-
-        public void ConsoleMessage(string message, Color color, TextEffectTypes effects = 0)
-        {
-            color = color ?? new Color();
-            ConsoleMessage(0, string.Empty, message, effects, color.R, color.G, color.B);
-        }
-
-        public void ConsoleMessage(string message)
-        {
-            ConsoleMessage(0, string.Empty, message, 0, 0, 0, 0);
-        }
-
-        virtual public void ConsoleMessage(IAvatar avatar, string name, string message, TextEffectTypes effects = 0, byte red = 0, byte green = 0, byte blue = 0)
-        {
-            ConsoleMessage(avatar.Session, name, message, effects, red, green, blue);
-        }
-
-        virtual public void UrlSendOverlay(IAvatar avatar, string url)
-        {
-            UrlSendOverlay(avatar.Session, url);
-        }
-
-        virtual public void UrlSendOverlay(IAvatar avatar, Uri url)
-        {
-            UrlSendOverlay(avatar.Session, url.AbsoluteUri);
-        }
-
-        virtual public void UrlSendOverlay(int avatarSession, string url)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_url_send(_instance, avatarSession, url, (int)UrlTarget.UrlTargetOverlay));
-            }
-        }
-
-        virtual public void UrlSendOverlay(int avatarSession, Uri url)
-        {
-            UrlSendOverlay(avatarSession, url.AbsoluteUri);
-        }
-
-        virtual public void UrlSend(IAvatar avatar, string url)
-        {
-            UrlSend(avatar.Session, url);
-        }
-
-        virtual public void UrlSend(IAvatar avatar, Uri url)
-        {
-            UrlSend(avatar.Session, url.AbsoluteUri);
-        }
-
-        virtual public void UrlSend(int avatarSession, string url)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_url_send(_instance, avatarSession, url, (int)UrlTarget.UrlTargetBrowser));
-            }
-        }
-
-        virtual public void UrlSend(int avatarSession, Uri url)
-        {
-            UrlSend(avatarSession, url.AbsoluteUri);
-        }
-
-        #endregion
-
-        #region IJoinFunctions Implementations
-        public virtual void Join(IAvatar avatar)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_join(_instance, avatar.UserId));
-            }
-        }
-
-        public virtual void Join(int userId)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_join(_instance, userId));
-            }
-        }
-
-
-        public virtual void JoinAccept(int requestId, string world, Vector3 location, float yaw, float pitch)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_join_accept(_instance, requestId, world,location.X,location.Y,location.Z,yaw,pitch));
-            }
-        }
-
-        public virtual void JoinAccept(int requestId, string world, double x, double y, double z, float yaw, float pitch)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_join_accept(_instance, requestId, world, x, y, z, yaw, pitch));
-            }
-        }
-
-        public virtual void JoinDecline(int requestId)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_join_decline(_instance, requestId));
-            }
-        }
-
-        #endregion
-
-        #region  IWorldPermissionFunctions Implementations
-
-        public virtual void WorldPermissionUser(string permission, int userId, int enable)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, permission, userId, enable));
-            }
-        }
-
-        public virtual void WorldPermissionUserEnable(WorldPermissions permission, IAvatar avatar)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission),avatar.UserId,1));
-            }
-        }
-
-        public virtual void WorldPermissionUserEnable(WorldPermissions permission, int userId)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), userId, 1));
-            }
-        }
-
-        public virtual void WorldPermissionUserDisable(WorldPermissions permission, IAvatar avatar)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), avatar.UserId, 0));
-            }
-        }
-
-        public virtual void WorldPermissionUserDisable(WorldPermissions permission, int userId)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), userId, 0));
-            }
-        }
-
-        public virtual void WorldPermissionSession(string permission, int sessionId, int enable)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_permission_session_set(_instance, permission, sessionId, enable));
-            }
-        }
-
-        public virtual void WorldPermissionSessionEnable(WorldPermissions permission, IAvatar avatar)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), avatar.Session, 1));
-            }
-        }
-
-        public virtual void WorldPermissionSessionEnable(WorldPermissions permission, int session)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), session, 1));
-            }
-        }
-
-
-        public virtual void WorldPermissionSessionDisable(WorldPermissions permission, IAvatar avatar)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), avatar.Session, 0));
-            }
-        }
-
-        public virtual void WorldPermissionSessionDisable(WorldPermissions permission, int session)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), session, 0));
-            }
-        }
-
-        #endregion
-
-        #region IWorldSettingsFunctions Implementations
-
-        public virtual void WorldSettingSession(string setting, string value, IAvatar toAvatar)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_setting_set(_instance, setting, value, toAvatar.Session));
-            }
-        }
-
-        public virtual void WorldSettingSession(string setting, string value, int  toSession)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_world_setting_set(_instance, setting, value, toSession));
-            }
-        }
-
-        #endregion
-
-        #endregion
-
-        #region Events
-
-        private readonly Dictionary<Events, EventDelegate> _nativeEvents = new Dictionary<Events, EventDelegate>();
-        private readonly Dictionary<Callbacks, CallbackDelegate> _nativeCallbacks = new Dictionary<Callbacks, CallbackDelegate>();
-
-
-
-
-
-        private void SetNativeEvent(Events eventType, EventDelegate eventFunction)
-        {
-            _nativeEvents[eventType] = eventFunction;
-            Functions.vp_event_set(_instance, (int)eventType, eventFunction);
-        }
-
-        private void SetNativeCallback(Callbacks callbackType, CallbackDelegate callbackFunction)
-        {
-            _nativeCallbacks[callbackType] = callbackFunction;
-            Functions.vp_callback_set(_instance, (int)callbackType, callbackFunction);
-        }
-
-        //public delegate void Event(T sender);
-        public delegate void ChatMessageDelegate(Instance sender, ChatMessageEventArgs args);
-
-        public delegate void AvatarChangeDelegate(Instance sender, AvatarChangeEventArgs args);
-        public delegate void AvatarEnterDelegate(Instance sender, AvatarEnterEventArgs args);
-        public delegate void AvatarLeaveDelegate(Instance sender, AvatarLeaveEventArgs args);
-        public delegate void AvatarClickDelegate(Instance sender, AvatarClickEventArgs args);
-
-        public delegate void TeleportDelegate(Instance sender, TeleportEventArgs args);
-
-        public delegate void UserAttributesDelegate(Instance sender, UserAttributesEventArgs args);
-
-        public delegate void WorldListEventDelegate(Instance sender, WorldListEventArgs args);
-
-        public delegate void ObjectCreateDelegate(Instance sender, ObjectCreateArgs args);
-        public delegate void ObjectChangeDelegate(Instance sender, ObjectChangeArgs args);
-        public delegate void ObjectDeleteDelegate(Instance sender, ObjectDeleteArgs args);
-        public delegate void ObjectClickDelegate(Instance sender, ObjectClickArgs args);
-        public delegate void ObjectBumpDelegate(Instance sender, ObjectBumpArgs args);
-
-        public delegate void QueryCellResultDelegate(Instance sender, QueryCellResultArgs args);
-        public delegate void QueryCellEndDelegate(Instance sender, QueryCellEndArgs args);
-
-        public delegate void WorldSettingsChangedDelegate(Instance sender, WorldSettingsChangedEventArgs args);
-        public delegate void WorldDisconnectDelegate(Instance sender, WorldDisconnectEventArgs args);
-
-        public delegate void UniverseDisconnectDelegate(Instance sender, UniverseDisconnectEventArgs args);
-        public delegate void JoinDelegate(Instance sender, JoinEventArgs args);
-
-        public delegate void FriendAddCallbackDelegate(Instance sender, FriendAddCallbackEventArgs args);
-        public delegate void FriendDeleteCallbackDelegate(Instance sender, FriendDeleteCallbackEventArgs args);
-        public delegate void FriendsGetCallbackDelegate(Instance sender, FriendsGetCallbackEventArgs args);
-
-        public event ChatMessageDelegate OnChatMessage;
-        public event AvatarEnterDelegate OnAvatarEnter;
-        public event AvatarChangeDelegate OnAvatarChange;
-        public event AvatarLeaveDelegate OnAvatarLeave;
-        public event AvatarClickDelegate OnAvatarClick;
-        public event JoinDelegate OnJoin;
-
-        public event TeleportDelegate OnTeleport;
-        public event UserAttributesDelegate OnUserAttributes;
-
-        public event ObjectCreateDelegate OnObjectCreate;
-        public event ObjectChangeDelegate OnObjectChange;
-        public event ObjectDeleteDelegate OnObjectDelete;
-        public event ObjectClickDelegate OnObjectClick;
-        public event ObjectBumpDelegate OnObjectBump;
-
-
-        public event WorldListEventDelegate OnWorldList;
-        public event WorldSettingsChangedDelegate OnWorldSettingsChanged;
-        public event FriendAddCallbackDelegate OnFriendAddCallback;
-        public event FriendsGetCallbackDelegate OnFriendsGetCallback;
-
-        public event WorldDisconnectDelegate OnWorldDisconnect;
-        public event UniverseDisconnectDelegate OnUniverseDisconnect;
-
-        public event QueryCellResultDelegate OnQueryCellResult;
-        public event QueryCellEndDelegate OnQueryCellEnd;
-
-        /* Events indirectly assosicated with VP */
-
-        public delegate void WorldEnterDelegate(Instance sender, WorldEnterEventArgs args);
-        public event WorldEnterDelegate OnWorldEnter;
-        public delegate void WorldLeaveDelegate(Instance sender, WorldLeaveEventArgs args);
-        public event WorldLeaveDelegate OnWorldLeave;
-
-        #endregion
-
-        #region CallbackHandlers
-
-        private void OnObjectCreateCallbackNative(IntPtr sender, int rc, int reference)
-        {
-            lock (this)
-            {
-                SetCompletionResult(reference, rc, Functions.vp_int(sender, IntegerAttribute.ObjectId));
-            }
-        }
-
-        private void OnObjectChangeCallbackNative(IntPtr sender, int rc, int reference)
-        {
-            lock (this)
-            {
-                SetCompletionResult(reference, rc, null);
-            }
-        }
-
-        private void OnObjectDeleteCallbackNative(IntPtr sender, int rc, int reference)
-        {
-            lock (this)
-            {
-                SetCompletionResult(reference, rc, null);
-            }
-        }
-
-        void OnObjectGetCallbackNative(IntPtr sender, int rc, int reference)
-        {
-            lock (this)
-            {
-                GetVpObject(sender, out IVpObject vpObject);
-
-                SetCompletionResult(reference, rc, vpObject);
-            }
-        }
-
-        private void OnObjectLoadCallbackNative(IntPtr sender, int rc, int reference)
-        {
-            lock (this)
-            {
-                SetCompletionResult(reference, rc, Functions.vp_int(sender, IntegerAttribute.ObjectId));
-            }
-        }
-        #endregion
-
-        #region Event handlers
-
-        private void OnUserAttributesNative(IntPtr sender)
-        {
-            if (OnUserAttributes == null)
-                return;
-            IUserAttributes att;
-            lock (this)
-            {
-                att = new UserAttributes()
-                          {
-                              Email = Functions.vp_string(sender, StringAttribute.UserEmail),
-                              Id = Functions.vp_int(sender, IntegerAttribute.UserId),
-                              LastLogin = DateTimeOffset.FromUnixTimeSeconds(Functions.vp_int(sender, IntegerAttribute.UserLastLogin)).UtcDateTime,
-                              Name = Functions.vp_string(sender, StringAttribute.UserName),
-                              OnlineTime = new TimeSpan(0, 0, 0, Functions.vp_int(sender, IntegerAttribute.UserOnlineTime)),
-                              RegistrationDate = DateTimeOffset.FromUnixTimeSeconds(Functions.vp_int(sender, IntegerAttribute.UserRegistrationTime)).UtcDateTime
-                          };
-            }
-            OnUserAttributes(this,new UserAttributesEventArgs(){UserAttributes = att});
-        }
-
-        private void OnTeleportNative(IntPtr sender)
-        {
-            if (OnTeleport == null)
-                return;
-            ITeleport teleport;
-            lock (this)
-            {
-                teleport = new Teleport
-                    {
-                        Avatar = GetAvatar(Functions.vp_int(sender, IntegerAttribute.AvatarSession)),
-                        Position = new Vector3
-                            {
-                                X = Functions.vp_double(sender, FloatAttribute.TeleportX),
-                                Y = Functions.vp_double(sender, FloatAttribute.TeleportY),
-                                Z = Functions.vp_double(sender, FloatAttribute.TeleportZ)
-                            },
-                        Rotation = new Vector3
-                            {
-                                X = Functions.vp_double(sender, FloatAttribute.TeleportPitch),
-                                Y = Functions.vp_double(sender, FloatAttribute.TeleportYaw),
-                                Z = 0 /* Roll not implemented yet */
-                            },
-                            // TODO: maintain user count and world state statistics.
-                        World = new World { Name = Functions.vp_string(sender, StringAttribute.TeleportWorld),State = WorldState.Unknown, UserCount=-1 }
-                    };
-            }
-            OnTeleport(this, new TeleportEventArgs() {Teleport = teleport});
-        }
-
-        private void OnGetFriendsCallbackNative(IntPtr sender, int rc, int reference)
-        {
-            if (OnFriendAddCallback == null)
-                return;
-            lock (this)
-            {
-                var friend = new Friend
-                {
-                    UserId = Functions.vp_int(sender, IntegerAttribute.UserId),
-                    Name = Functions.vp_string(sender, StringAttribute.FriendName),
-                    Online = Functions.vp_int(sender, IntegerAttribute.FriendOnline) == 1
-                };
-                OnFriendsGetCallback(this, new FriendsGetCallbackEventArgs { Friend = friend });
-            }
-        }
-
-        private void OnFriendDeleteCallbackNative(IntPtr sender, int rc, int reference)
-        {
-            // todo: implement this.
-        }
-
-        private void OnFriendAddCallbackNative(IntPtr sender, int rc, int reference)
-        {
-            // todo: implement this.
-        }
-
-
-        private void OnChatNative(IntPtr sender)
-        {
-            ChatMessageEventArgs data;
-            lock (this)
-            {
-                if (!_avatars.ContainsKey(Functions.vp_int(sender, IntegerAttribute.AvatarSession)))
-                {
-                    var avatar = new Avatar
-                        {
-                            Name = Functions.vp_string(sender, StringAttribute.AvatarName),
-                            Session = Functions.vp_int(sender, IntegerAttribute.AvatarSession)
-                        };
-                    _avatars.Add(avatar.Session, avatar);
-                }
-                data = new ChatMessageEventArgs
-                {
-                    Avatar = _avatars[Functions.vp_int(sender, IntegerAttribute.AvatarSession)],
-                    ChatMessage = new ChatMessage()
-                    {
-                        Type = (ChatMessageTypes)Functions.vp_int(sender, IntegerAttribute.ChatType),
-                        Message = Functions.vp_string(sender, StringAttribute.ChatMessage),
-                        Name = Functions.vp_string(sender, StringAttribute.AvatarName),
-                        TextEffectTypes = (TextEffectTypes)Functions.vp_int(sender, IntegerAttribute.ChatEffects)
-                    }
-                };
-                OperatingSystem os = Environment.OSVersion;
-
-                if (OnChatMessage == null) return;
-                if (data.ChatMessage.Type == ChatMessageTypes.Console)
-                {
-                    data.ChatMessage.Color = new Color
-                    {
-                        R = (byte)Functions.vp_int(sender, IntegerAttribute.ChatRolorRed),
-                        G = (byte)Functions.vp_int(sender, IntegerAttribute.ChatColorGreen),
-                        B = (byte)Functions.vp_int(sender, IntegerAttribute.ChatColorBlue)
-                    };
-                }
-                else
-                {
-                    data.ChatMessage.Color = new Color
-                    {
-                        R = 0,
-                        G = 0,
-                        B = 0
-                    };
-                }
-            }
-            OnChatMessage(this, data);
-        }
-
-        private void OnAvatarAddNative(IntPtr sender)
-        {
-            IAvatar data;
-            lock (this)
-            {
-                data = new Avatar()
-                {
-                    UserId = Functions.vp_int(sender, IntegerAttribute.UserId),
-                    Name = Functions.vp_string(sender, StringAttribute.AvatarName),
-                    Session = Functions.vp_int(sender, IntegerAttribute.AvatarSession),
-                    AvatarType = Functions.vp_int(sender, IntegerAttribute.AvatarType),
-                    Position = new Vector3
-                    {
-                        X = Functions.vp_double(sender, FloatAttribute.AvatarX),
-                        Y = Functions.vp_double(sender, FloatAttribute.AvatarY),
-                        Z = Functions.vp_double(sender, FloatAttribute.AvatarZ)
-                    },
-                    Rotation = new Vector3
-                    {
-                        X = Functions.vp_double(sender, FloatAttribute.AvatarPitch),
-                        Y = Functions.vp_double(sender, FloatAttribute.AvatarYaw),
-                        Z = 0 /* roll currently not supported*/
-                    },
-                    ApplicationName = Functions.vp_string(sender, StringAttribute.AvatarApplicationName),
-                    ApplicationVersion = Functions.vp_string(sender, StringAttribute.AvatarApplicationVersion)
-                };
-                if (!_avatars.ContainsKey(data.Session))
-                    _avatars.Add(data.Session, data);
-            }
-            data.LastChanged = DateTime.UtcNow;
-            if (OnAvatarEnter == null) return;
-            var args = new AvatarEnterEventArgs {Avatar = data, Implementor = this};
-            args.Initialize();
-            OnAvatarEnter(this, args);
-        }
-
-        private void OnAvatarChangeNative(IntPtr sender)
-        {
-            IAvatar old;
-            IAvatar data;
-            lock (this)
-            {
-                data = new Avatar()
-                {
-                    UserId = _avatars[Functions.vp_int(sender, IntegerAttribute.AvatarSession)].UserId,
-                    Name = Functions.vp_string(sender, StringAttribute.AvatarName),
-                    Session = Functions.vp_int(sender, IntegerAttribute.AvatarSession),
-                    AvatarType = Functions.vp_int(sender, IntegerAttribute.AvatarType),
-                    Position = new Vector3
-                    {
-                        X = Functions.vp_double(sender, FloatAttribute.AvatarX),
-                        Y = Functions.vp_double(sender, FloatAttribute.AvatarY),
-                        Z = Functions.vp_double(sender, FloatAttribute.AvatarZ)
-                    },
-                    Rotation = new Vector3
-                    {
-                        X = Functions.vp_double(sender, FloatAttribute.AvatarPitch),
-                        Y = Functions.vp_double(sender, FloatAttribute.AvatarYaw),
-                        Z = 0 /* roll currently not supported*/
-                    }
-                };
-                // determine if the avatar actually changed.
-                old = new Avatar().CopyFrom(_avatars[data.Session], true);
-                if (data.Position.X == old.Position.X
-                    && data.Position.Y == old.Position.Y
-                    && data.Position.Z == old.Position.Z
-                    && data.Rotation.X == old.Rotation.X
-                    && data.Rotation.Y == old.Rotation.Y
-                    && data.Rotation.Z == old.Rotation.Z)
-                    return;
-                data.LastChanged = DateTime.UtcNow;
-                SetAvatar(data);
-
-            }
-            OnAvatarChange?.Invoke(this, new AvatarChangeEventArgs { Avatar = _avatars[data.Session], AvatarPrevious = old });
-        }
-
-        private void OnAvatarDeleteNative(IntPtr sender)
-        {
-            IAvatar data;
-            lock (this)
-            {
-                try
-                {
-                    data = _avatars[Functions.vp_int(sender, IntegerAttribute.AvatarSession)];
-                    _avatars.Remove(data.Session);
-                    if (OnAvatarLeave == null) return;
-                    OnAvatarLeave(this, new AvatarLeaveEventArgs { Avatar = data });
-                }
-                catch
-                {
-
-                }
-            }
-        }
-
-        private void OnAvatarClickNative(IntPtr sender)
-        {
-            if (OnAvatarClick == null) return;
-            lock (this)
-            {
-                var clickedAvatar = Functions.vp_int(sender, IntegerAttribute.ClickedSession);
-                if (clickedAvatar == 0)
-                    clickedAvatar = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
-
-                OnAvatarClick(this,
-                    new AvatarClickEventArgs
-                    {
-                        Avatar = GetAvatar(Functions.vp_int(sender, IntegerAttribute.AvatarSession)),
-                        ClickedAvatar = GetAvatar(clickedAvatar),
-                        WorldHit = new Vector3
-                        {
-                            X = Functions.vp_double(sender, FloatAttribute.ClickHitX),
-                            Y = Functions.vp_double(sender, FloatAttribute.ClickHitY),
-                            Z = Functions.vp_double(sender, FloatAttribute.ClickHitZ)
-                        }
-                    });
-            }
-        }
-
-        private void OnObjectClickNative(IntPtr sender)
-        {
-            if (OnObjectClick == null) return;
-            int session;
-            int objectId;
-            Vector3 world;
-            lock (this)
-            {
-                session = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
-                objectId = Functions.vp_int(sender, IntegerAttribute.ObjectId);
-                world = new Vector3
-                    {
-                        X = Functions.vp_double(sender, FloatAttribute.ClickHitX),
-                        Y = Functions.vp_double(sender, FloatAttribute.ClickHitY),
-                        Z = Functions.vp_double(sender, FloatAttribute.ClickHitZ)
-                    };
-            }
-
-            OnObjectClick(this,
-                          new ObjectClickArgs
-                              {WorldHit=world, Avatar = GetAvatar(session), VpObject = new VpObject {Id = objectId}});
-        }
-
-        private void OnObjectBumpNative(IntPtr sender)
-        {
-            if (OnObjectBump == null) return;
-            int session;
-            int objectId;
-            lock (this)
-            {
-                session = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
-                objectId = Functions.vp_int(sender, IntegerAttribute.ObjectId);
-            }
-
-            OnObjectBump(this,
-                          new ObjectBumpArgs { BumpType = BumpType.BumpBegin, Avatar = GetAvatar(session), VpObject = new VpObject { Id = objectId } });
-        }
-
-        private void OnObjectBumpEndNative(IntPtr sender)
-        {
-            if (OnObjectBump == null) return;
-            int session;
-            int objectId;
-            lock (this)
-            {
-                session = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
-                objectId = Functions.vp_int(sender, IntegerAttribute.ObjectId);
-            }
-
-            OnObjectBump(this,
-                          new ObjectBumpArgs { BumpType = BumpType.BumpEnd, Avatar = GetAvatar(session), VpObject = new VpObject { Id = objectId } });
-        }
-
-        private void OnObjectDeleteNative(IntPtr sender)
-        {
-            if (OnObjectDelete == null) return;
-            int session;
-            int objectId;
-            lock (this)
-            {
-                session = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
-                objectId = Functions.vp_int(sender, IntegerAttribute.ObjectId);
-            }
-            OnObjectDelete(this, new ObjectDeleteArgs { Avatar = GetAvatar(session), VpObject = new VpObject { Id = objectId } });
-        }
-
-        private void OnObjectCreateNative(IntPtr sender)
-        {
-            if (OnObjectCreate == null && OnQueryCellResult == null) return;
-            IVpObject vpObject;
-            int session;
-            lock (this)
-            {
-                session = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
-                GetVpObject(sender, out vpObject);
-            }
-            if (session == 0 && OnQueryCellResult != null)
-                OnQueryCellResult(this, new QueryCellResultArgs { VpObject = vpObject });
-            else
-                OnObjectCreate?.Invoke(this, new ObjectCreateArgs { Avatar = GetAvatar(session), VpObject = vpObject });
-        }
-
-
-
-        public List<IAvatar> Avatars()
-        {
-            return _avatars.Values.ToList();
-        }
-
-        [Obsolete("Objects are not firewalled anymore, so commits are not needed.")]
-        public void Commit(IAvatar avatar)
-        {
-            //lock (_avatars)
-            //{
-            //    var cache = _avatars[avatar.Session];
-            //    cache.CopyFrom(avatar, false);
-            //    foreach (var prop in cache.GetType().GetFields())
-            //    {
-            //        if (prop.FieldType.BaseType!=null && prop.FieldType.BaseType.Name.StartsWith("BaseInstanceT"))
-            //            prop.SetValue(cache, this);
-            //    }
-            //    _avatars[avatar.Session] = cache;
-            //}
-        }
-
-        public IAvatar GetAvatar(int session)
-        {
-            if (_avatars.ContainsKey(session))
-                return _avatars[session];
-            var avatar = new Avatar { Session = session };
-            _avatars.Add(session, avatar);
-            return avatar;
-        }
-
-        private void SetAvatar(IAvatar avatar)
-        {
-            lock (this)
-            {
-                if (_avatars.ContainsKey(avatar.Session))
-                {
-                    ((Avatar)_avatars[avatar.Session]).CopyFrom(avatar, true);
-                }
-                else
-                {
-                    _avatars[avatar.Session] = avatar;
-                }
-            }
-        }
-
-        private static void GetVpObject(IntPtr sender, out IVpObject vpObject)
-        {
-            vpObject = new VpObject
-            {
-                Action = Functions.vp_string(sender, StringAttribute.ObjectAction),
-                Description = Functions.vp_string(sender, StringAttribute.ObjectDescription),
-                Id = Functions.vp_int(sender, IntegerAttribute.ObjectId),
-                Model = Functions.vp_string(sender, StringAttribute.ObjectModel),
-                Data = Functions.GetData(sender, DataAttribute.ObjectData),
-
-                Rotation = new Vector3
-                {
-                    X = Functions.vp_double(sender, FloatAttribute.ObjectRotationX),
-                    Y = Functions.vp_double(sender, FloatAttribute.ObjectRotationY),
-                    Z = Functions.vp_double(sender, FloatAttribute.ObjectRotationZ)
-                },
-
-                Time = DateTimeOffset.FromUnixTimeSeconds(Functions.vp_int(sender, IntegerAttribute.ObjectTime)).UtcDateTime,
-                ObjectType = Functions.vp_int(sender, IntegerAttribute.ObjectType),
-                Owner = Functions.vp_int(sender, IntegerAttribute.ObjectUserId),
-                Position = new Vector3
-                {
-                    X = Functions.vp_double(sender, FloatAttribute.ObjectX),
-                    Y = Functions.vp_double(sender, FloatAttribute.ObjectY),
-                    Z = Functions.vp_double(sender, FloatAttribute.ObjectZ)
-                },
-                Angle = Functions.vp_double(sender, FloatAttribute.ObjectRotationAngle)
-            };
-        }
-
-        private void OnObjectChangeNative(IntPtr sender)
-        {
-            if (OnObjectChange == null) return;
-            IVpObject vpObject;
-            int sessionId;
-            lock (this)
-            {
-                GetVpObject(sender,out vpObject);
-                sessionId = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
-            }
-            OnObjectChange(this, new ObjectChangeArgs { Avatar = GetAvatar(sessionId), VpObject = vpObject });
-        }
-
-        private void OnQueryCellEndNative(IntPtr sender)
-        {
-            if (OnQueryCellEnd == null) return;
-            int x;
-            int z;
-            lock (this)
-            {
-                x = Functions.vp_int(sender, IntegerAttribute.CellX);
-                z = Functions.vp_int(sender, IntegerAttribute.CellZ);
-            }
-            OnQueryCellEnd(this, new QueryCellEndArgs { Cell = new Cell { X = x, Z = z } });
-        }
-
-        private void OnWorldListNative(IntPtr sender)
-        {
-            if (OnWorldList == null)
-                return;
-
-            IWorld data;
-            lock (this)
-            {
-                string worldName = Functions.vp_string(_instance, StringAttribute.WorldName);
-                data = new World()
-                {
-                    Name = worldName,
-                    State = (WorldState)Functions.vp_int(_instance, IntegerAttribute.WorldState),
-                    UserCount = Functions.vp_int(_instance, IntegerAttribute.WorldUsers)
-                };
-            }
-            if (_worlds.ContainsKey(data.Name))
-                _worlds.Remove(data.Name);
-            _worlds.Add(data.Name,data);
-            OnWorldList(this, new WorldListEventArgs { World = data as World });
-        }
-
-        private void OnWorldSettingNativeEvent(IntPtr instance)
-        {
-            if (!_worlds.ContainsKey(Configuration.World.Name))
-            {
-                _worlds.Add(Configuration.World.Name,Configuration.World);
-            }
-            var world = _worlds[Configuration.World.Name];
-            var key = Functions.vp_string(instance, StringAttribute.WorldSettingKey);
-            var value = Functions.vp_string(instance, StringAttribute.WorldSettingValue);
-            world.RawAttributes[key] = value;
-        }
-
-        private void OnWorldSettingsChangedNativeEvent(IntPtr instance)
-        {
-            // Initialize World Object Cache if a local object path has been specified and a objectpath is speficied in the world attributes.
-            // TODO: some world, such as Test do not specify a objectpath, maybe there's a default search path we dont know of.
-            var world = _worlds[Configuration.World.Name];
-
-            OnWorldSettingsChanged?.Invoke(this, new WorldSettingsChangedEventArgs { World = (World)_worlds[Configuration.World.Name] });
-        }
-
-        private void OnUniverseDisconnectNative(IntPtr sender)
-        {
-            if (OnUniverseDisconnect == null) return;
-            OnUniverseDisconnect(this, new UniverseDisconnectEventArgs { Universe = Universe });
-        }
-
-        private void OnWorldDisconnectNative(IntPtr sender)
-        {
-            if (OnWorldDisconnect == null) return;
-            OnWorldDisconnect(this, new WorldDisconnectEventArgs { World = (World) World });
-        }
-
-        private void OnJoinNative(IntPtr sender)
-        {
-            if (OnJoin == null) return;
-            OnJoin(this, new JoinEventArgs {
-                UserId = Functions.vp_int(sender, IntegerAttribute.UserId),
-                Id = Functions.vp_int(sender, IntegerAttribute.JoinId),
-                Name = Functions.vp_string(sender, StringAttribute.JoinName)
-            });
-        }
-
-        #endregion
-
-        #region Cleanup
-
-        public void ReleaseEvents()
-        {
-            lock (this)
-            {
-                OnChatMessage = null;
-                OnAvatarEnter = null;
-                OnAvatarChange = null;
-                OnAvatarLeave = null;
-                OnObjectCreate = null;
-                OnObjectChange = null;
-                OnObjectDelete = null;
-                OnObjectClick = null;
-                OnObjectBump = null;
-                OnWorldList = null;
-                OnWorldDisconnect = null;
-                OnWorldSettingsChanged = null;
-                OnWorldDisconnect = null;
-                OnUniverseDisconnect = null;
-                //OnUserAttributes = null;
-                OnQueryCellResult = null;
-                OnQueryCellEnd = null;
-                OnFriendAddCallback = null;
-                OnFriendsGetCallback = null;
-            }
-        }
-
-        public void Dispose()
-        {
-            if (_instance != IntPtr.Zero)
-            {
-                Functions.vp_destroy(_instance);
-            }
-
-            if (instanceHandle != null)
-            {
-                instanceHandle.Free();
-            }
-
-            GC.SuppressFinalize(this);
-        }
-
-        #endregion
-
-        #region Friend Functions
-
-        public void GetFriends()
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_friends_get(_instance));
-            }
-        }
-
-        public void AddFriendByName(IFriend friend)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_friend_add_by_name(_instance, friend.Name));
-            }
-        }
-
-        public void AddFriendByName(string name)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_friend_add_by_name(_instance, name));
-            }
-        }
-
-        public void DeleteFriendById(int friendId)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_friend_delete(_instance, friendId));
-            }
-        }
-
-        public void DeleteFriendById(IFriend friend)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_friend_delete(_instance, friend.UserId));
-            }
-        }
-
-        #endregion
-
-        #region ITerrainFunctions Implementation
-
-        public void TerrianQuery(int tileX, int tileZ, int[,] nodes)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_terrain_query(_instance, tileX, tileZ, nodes));
-            }
-        }
-
-        public void SetTerrainNode(int tileX, int tileZ, int nodeX, int nodeZ, TerrainCell[,] cells)
-        {
-            lock (this)
-            {
-                CheckReasonCode(Functions.vp_terrain_node_set(_instance, tileX, tileZ, nodeX, nodeZ, cells));
-            }
-        }
-
-        #endregion
-
-        #region Implementation of IInstanceEvents
-        
-        internal event EventDelegate OnChatNativeEvent;
-        internal event EventDelegate OnAvatarAddNativeEvent;
-        internal event EventDelegate OnAvatarDeleteNativeEvent;
-        internal event EventDelegate OnAvatarChangeNativeEvent;
-        internal event EventDelegate OnAvatarClickNativeEvent;
-        internal event EventDelegate OnWorldListNativeEvent;
-        internal event EventDelegate OnObjectChangeNativeEvent;
-        internal event EventDelegate OnObjectCreateNativeEvent;
-        internal event EventDelegate OnObjectDeleteNativeEvent;
-        internal event EventDelegate OnObjectClickNativeEvent;
-        internal event EventDelegate OnObjectBumpNativeEvent;
-        internal event EventDelegate OnObjectBumpEndNativeEvent;
-        internal event EventDelegate OnQueryCellEndNativeEvent;
-        internal event EventDelegate OnUniverseDisconnectNativeEvent;
-        internal event EventDelegate OnWorldDisconnectNativeEvent;
-        internal event EventDelegate OnTeleportNativeEvent;
-        internal event EventDelegate OnUserAttributesNativeEvent;
-        internal event EventDelegate OnJoinNativeEvent;
-
-        internal event CallbackDelegate OnObjectCreateCallbackNativeEvent;
-        internal event CallbackDelegate OnObjectChangeCallbackNativeEvent;
-        internal event CallbackDelegate OnObjectDeleteCallbackNativeEvent;
-        internal event CallbackDelegate OnObjectGetCallbackNativeEvent;
-        internal event CallbackDelegate OnObjectLoadCallbackNativeEvent;
-        internal event CallbackDelegate OnFriendAddCallbackNativeEvent;
-        internal event CallbackDelegate OnFriendDeleteCallbackNativeEvent;
-        internal event CallbackDelegate OnGetFriendsCallbackNativeEvent;
-
-        internal event CallbackDelegate OnJoinCallbackNativeEvent;
-        internal event CallbackDelegate OnWorldPermissionUserSetCallbackNativeEvent;
-        internal event CallbackDelegate OnWorldPermissionSessionSetCallbackNativeEvent;
-        internal event CallbackDelegate OnWorldSettingsSetCallbackNativeEvent;
-        
-        #endregion
-   
-        public InstanceConfiguration Configuration { get; private set; }
-
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using VpNet.Abstract;
+using VpNet.Extensions;
+using VpNet.Interfaces;
+using VpNet.ManagedApi.System;
+using VpNet.NativeApi;
+
+namespace VpNet.ManagedApi
+{
+    /// <summary>
+    /// Abtract fully teamplated instance class, providing .NET encapsulation strict templated types to the native C wrapper.
+    /// </summary>
+    [Serializable]
+    public partial class Instance : IInstance
+    {
+        bool _isInitialized;
+
+        private readonly Dictionary<int, TaskCompletionSource<object>> _objectCompletionSources = new Dictionary<int, TaskCompletionSource<object>>();
+
+        private Dictionary<int, IAvatar> _avatars;
+
+        Dictionary<string, IWorld> _worlds;
+        internal IntPtr _instance;
+        private IUniverse Universe { get; set; }
+        private IWorld World { get; set; }
+        private NetConfig netConfig;
+        private GCHandle instanceHandle;
+        private TaskCompletionSource<object> ConnectCompletionSource;
+        private TaskCompletionSource<object> LoginCompletionSource;
+        private TaskCompletionSource<object> EnterCompletionSource;
+
+        internal void InitOnce()
+        {
+            instanceHandle = GCHandle.Alloc(this);
+            netConfig.Context = GCHandle.ToIntPtr(instanceHandle);
+            netConfig.Create = Connection.CreateNative;
+            netConfig.Destroy = Connection.DestroyNative;
+            netConfig.Connect = Connection.ConnectNative;
+            netConfig.Receive = Connection.ReceiveNative;
+            netConfig.Send = Connection.SendNative;
+            netConfig.Timeout = Connection.TimeoutNative;
+
+            OnChatNativeEvent += OnChatNative;
+            OnAvatarAddNativeEvent += OnAvatarAddNative;
+            OnAvatarChangeNativeEvent += OnAvatarChangeNative;
+            OnAvatarDeleteNativeEvent += OnAvatarDeleteNative;
+            OnAvatarClickNativeEvent += OnAvatarClickNative;
+            OnWorldListNativeEvent += OnWorldListNative;
+            OnWorldDisconnectNativeEvent += OnWorldDisconnectNative;
+
+            OnObjectChangeNativeEvent += OnObjectChangeNative;
+            OnObjectCreateNativeEvent += OnObjectCreateNative;
+            OnObjectClickNativeEvent += OnObjectClickNative;
+            OnObjectBumpNativeEvent += OnObjectBumpNative;
+            OnObjectBumpEndNativeEvent += OnObjectBumpEndNative;
+            OnObjectDeleteNativeEvent += OnObjectDeleteNative;
+
+            OnQueryCellEndNativeEvent += OnQueryCellEndNative;
+            OnUniverseDisconnectNativeEvent += OnUniverseDisconnectNative;
+            OnTeleportNativeEvent += OnTeleportNative;
+            OnUserAttributesNativeEvent += OnUserAttributesNative;
+            OnJoinNativeEvent += OnJoinNative;
+
+            OnObjectCreateCallbackNativeEvent += OnObjectCreateCallbackNative;
+            OnObjectChangeCallbackNativeEvent += OnObjectChangeCallbackNative;
+            OnObjectDeleteCallbackNativeEvent += OnObjectDeleteCallbackNative;
+            OnObjectGetCallbackNativeEvent += OnObjectGetCallbackNative;
+            this.OnObjectLoadCallbackNativeEvent += this.OnObjectLoadCallbackNative;
+
+            OnFriendAddCallbackNativeEvent += OnFriendAddCallbackNative;
+            OnFriendDeleteCallbackNativeEvent += OnFriendDeleteCallbackNative;
+            OnGetFriendsCallbackNativeEvent += OnGetFriendsCallbackNative;
+        }
+
+        public Instance()
+        {
+            Universe = new Universe();
+            Configuration = new InstanceConfiguration();
+            _worlds = new Dictionary<string, IWorld>();
+            _avatars = new Dictionary<int, IAvatar>();
+            InitOnce();
+            InitVpNative();
+        }
+
+
+        private void InitVpNative()
+        {
+               
+            int rc = Functions.vp_init(5);
+            if (rc != 0)
+            {
+                throw new VpException((ReasonCode)rc);
+            }
+
+            _instance = Functions.vp_create(ref netConfig);
+
+            SetNativeEvent(Events.Chat, OnChatNative1);
+            SetNativeEvent(Events.AvatarAdd, OnAvatarAddNative1);
+            SetNativeEvent(Events.AvatarChange, OnAvatarChangeNative1);
+            SetNativeEvent(Events.AvatarDelete, OnAvatarDeleteNative1);
+            SetNativeEvent(Events.AvatarClick, OnAvatarClickNative1);
+            SetNativeEvent(Events.WorldList, OnWorldListNative1);
+            SetNativeEvent(Events.WorldSetting, OnWorldSettingNative1);
+            SetNativeEvent(Events.WorldSettingsChanged, OnWorldSettingsChangedNative1);
+            SetNativeEvent(Events.ObjectChange, OnObjectChangeNative1);
+            SetNativeEvent(Events.Object, OnObjectCreateNative1);
+            SetNativeEvent(Events.ObjectClick, OnObjectClickNative1);
+            SetNativeEvent(Events.ObjectBumpBegin, OnObjectBumpNative1);
+            SetNativeEvent(Events.ObjectBumpEnd, OnObjectBumpEndNative1);
+            SetNativeEvent(Events.ObjectDelete, OnObjectDeleteNative1);
+            SetNativeEvent(Events.QueryCellEnd, OnQueryCellEndNative1);
+            SetNativeEvent(Events.UniverseDisconnect, OnUniverseDisconnectNative1);
+            SetNativeEvent(Events.WorldDisconnect, OnWorldDisconnectNative1);
+            SetNativeEvent(Events.Teleport, OnTeleportNative1);
+            SetNativeEvent(Events.UserAttributes, OnUserAttributesNative1);
+            SetNativeEvent(Events.Join, OnJoinNative1);
+            SetNativeCallback(Callbacks.ObjectAdd, OnObjectCreateCallbackNative1);
+            SetNativeCallback(Callbacks.ObjectChange, OnObjectChangeCallbackNative1);
+            SetNativeCallback(Callbacks.ObjectDelete, OnObjectDeleteCallbackNative1);
+            SetNativeCallback(Callbacks.ObjectGet, OnObjectGetCallbackNative1);
+            SetNativeCallback(Callbacks.ObjectLoad, this.OnObjectLoadCallbackNative1);
+            SetNativeCallback(Callbacks.FriendAdd, OnFriendAddCallbackNative1);
+            SetNativeCallback(Callbacks.FriendDelete, OnFriendDeleteCallbackNative1);
+            SetNativeCallback(Callbacks.GetFriends, OnGetFriendsCallbackNative1);
+            SetNativeCallback(Callbacks.Login, OnLoginCallbackNative1);
+            SetNativeCallback(Callbacks.Enter, OnEnterCallbackNativeEvent1);
+            //SetNativeCallback(Callbacks.Join, OnJoinCallbackNativeEvent1);
+            SetNativeCallback(Callbacks.ConnectUniverse, OnConnectUniverseCallbackNative1);
+            //SetNativeCallback(Callbacks.WorldPermissionUserSet, OnWorldPermissionUserSetCallbackNative1);
+            //SetNativeCallback(Callbacks.WorldPermissionSessionSet, OnWorldPermissionSessionSetCallbackNative1);
+            //SetNativeCallback(Callbacks.WorldSettingSet, OnWorldSettingsSetCallbackNative1);
+        }
+
+        internal void OnObjectCreateCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnObjectCreateCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnObjectChangeCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnObjectChangeCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnObjectDeleteCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnObjectDeleteCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnObjectGetCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnObjectGetCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnFriendAddCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnFriendAddCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnFriendDeleteCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnFriendDeleteCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnGetFriendsCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnFriendDeleteCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnObjectLoadCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnObjectLoadCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnLoginCallbackNative1(IntPtr instance, int rc, int reference)
+        {
+            lock (this)
+            {
+                SetCompletionResult(LoginCompletionSource, rc, null);
+            }
+        }
+        internal void OnEnterCallbackNativeEvent1(IntPtr instance, int rc, int reference)
+        {
+            lock (this)
+            {
+                SetCompletionResult(EnterCompletionSource, rc, null);
+                OnWorldEnter?.Invoke(this, new WorldEnterEventArgs() { World = World });
+            }
+        }
+        internal void OnJoinCallbackNativeEvent1(IntPtr instance, int rc, int reference) { lock (this) { OnJoinCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnConnectUniverseCallbackNative1(IntPtr instance, int rc, int reference)
+        {
+            lock (this)
+            {
+                SetCompletionResult(ConnectCompletionSource, rc, null);
+            }
+        }
+        internal void OnWorldPermissionUserSetCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnWorldPermissionUserSetCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnWorldPermissionSessionSetCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnWorldPermissionSessionSetCallbackNativeEvent(instance, rc, reference); } }
+        internal void OnWorldSettingsSetCallbackNative1(IntPtr instance, int rc, int reference) { lock (this) { OnWorldSettingsSetCallbackNativeEvent(instance, rc, reference); } }
+
+
+
+        internal void OnChatNative1(IntPtr instance) { lock (this) { OnChatNativeEvent(instance); } }
+        internal void OnAvatarAddNative1(IntPtr instance) { lock (this) { OnAvatarAddNativeEvent(instance); } }
+        internal void OnAvatarChangeNative1(IntPtr instance) { lock (this) { OnAvatarChangeNativeEvent(instance); } }
+        internal void OnAvatarDeleteNative1(IntPtr instance) { lock (this) { OnAvatarDeleteNativeEvent(instance); } }
+        internal void OnAvatarClickNative1(IntPtr instance) { lock (this) { OnAvatarClickNativeEvent(instance); } }
+        internal void OnWorldListNative1(IntPtr instance) { lock (this) { OnWorldListNativeEvent(instance); } }
+        internal void OnWorldDisconnectNative1(IntPtr instance) { lock (this) { OnWorldDisconnectNativeEvent(instance); } }
+        internal void OnWorldSettingsChangedNative1(IntPtr instance) { lock (this) { OnWorldSettingsChangedNativeEvent(instance); } }
+        internal void OnWorldSettingNative1(IntPtr instance) { lock (this) { OnWorldSettingNativeEvent(instance); } }
+        internal void OnObjectChangeNative1(IntPtr instance) { lock (this) { OnObjectChangeNativeEvent(instance); } }
+        internal void OnObjectCreateNative1(IntPtr instance) { lock (this) { OnObjectCreateNativeEvent(instance); } }
+        internal void OnObjectClickNative1(IntPtr instance) { lock (this) { OnObjectClickNativeEvent(instance); } }
+        internal void OnObjectBumpNative1(IntPtr instance) { lock (this) { OnObjectBumpNativeEvent(instance); } }
+        internal void OnObjectBumpEndNative1(IntPtr instance) { lock (this) { OnObjectBumpEndNativeEvent(instance); } }
+        internal void OnObjectDeleteNative1(IntPtr instance) { lock (this) { OnObjectDeleteNativeEvent(instance); } }
+        internal void OnQueryCellEndNative1(IntPtr instance) { lock (this) { OnQueryCellEndNativeEvent(instance); } }
+        internal void OnUniverseDisconnectNative1(IntPtr instance) { lock (this) { OnUniverseDisconnectNativeEvent(instance); } }
+        internal void OnTeleportNative1(IntPtr instance) { lock (this) { OnTeleportNativeEvent(instance); } }
+        internal void OnUserAttributesNative1(IntPtr instance) { lock (this){OnUserAttributesNativeEvent(instance);} }
+        internal void OnJoinNative1(IntPtr instance) { lock (this) { OnJoinNativeEvent(instance); } }
+
+        #region Methods
+
+        private void SetCompletionResult(int referenceNumber, int rc, object result)
+        {
+            var tcs = _objectCompletionSources[referenceNumber];
+            SetCompletionResult(tcs, rc, result);
+        }
+
+        private static void SetCompletionResult(TaskCompletionSource<object> tcs, int rc, object result)
+        {
+            if (rc != 0)
+            {
+                tcs.SetException(new VpException((ReasonCode)rc));
+            }
+            else
+            {
+                tcs.SetResult(result);
+            }
+        }
+
+        private static void CheckReasonCode(int rc)
+        {
+            if (rc != 0)
+            {
+                throw new VpException((ReasonCode)rc);
+            }
+        }
+
+        #region IUniverseFunctions Implementations
+
+        virtual public Task ConnectAsync(string host = "universe.virtualparadise.org", ushort port = 57000)
+        {
+            Universe.Host = host;
+            Universe.Port = port;
+
+            lock (this)
+            {
+                ConnectCompletionSource = new TaskCompletionSource<object>();
+                var rc = Functions.vp_connect_universe(_instance, host, port);
+                if (rc != 0)
+                {
+                    return Task.FromException(new VpException((ReasonCode)rc));
+                }
+                return ConnectCompletionSource.Task;
+            }
+        }
+
+        virtual public async Task LoginAndEnterAsync(bool announceAvatar = true)
+        {
+            await ConnectAsync();
+            await LoginAsync();
+            await EnterAsync();
+            if (announceAvatar)
+            {
+                UpdateAvatar();
+            }
+        }
+
+        virtual public async Task LoginAsync()
+        {
+            if (Configuration == null ||
+                string.IsNullOrEmpty(Configuration.BotName) ||
+                string.IsNullOrEmpty(Configuration.Password) ||
+                string.IsNullOrEmpty(Configuration.UserName)
+                )
+            {
+                throw new ArgumentException("Can't login because of Incomplete login configuration.");
+            }
+
+            await LoginAsync(Configuration.UserName, Configuration.Password, Configuration.BotName);
+        }
+
+        virtual public Task LoginAsync(string username, string password, string botname)
+        {
+            lock (this)
+            {
+                Configuration.BotName = botname;
+                Configuration.UserName = username;
+                Configuration.Password = password;
+                Functions.vp_string_set(_instance, StringAttribute.ApplicationName, Configuration.ApplicationName);
+                Functions.vp_string_set(_instance, StringAttribute.ApplicationVersion, Configuration.ApplicationVersion);
+
+                LoginCompletionSource = new TaskCompletionSource<object>();
+                var rc = Functions.vp_login(_instance, username, password, botname);
+                if (rc != 0)
+                {
+                    return Task.FromException(new VpException((ReasonCode)rc));
+                }
+
+                return LoginCompletionSource.Task;
+            }
+        }
+
+        #endregion
+
+        #region IWorldFunctions Implementations
+        [Obsolete("No longer necessary for network IO to occur")]
+        virtual public void Wait(int milliseconds = 10)
+        {
+            Thread.Sleep(milliseconds);
+        }
+
+        virtual public Task EnterAsync(string worldname)
+        {
+            return EnterAsync(new World { Name = worldname });
+        }
+
+        virtual public Task EnterAsync()
+        {
+            if (Configuration == null || Configuration.World == null || string.IsNullOrEmpty(Configuration.World.Name))
+                throw new ArgumentException("Can't login because of Incomplete instance world configuration.");
+            return EnterAsync(Configuration.World);
+        }
+
+        virtual public Task EnterAsync(IWorld world)
+        {
+            lock (this)
+            {
+                Configuration.World = world;
+
+                EnterCompletionSource = new TaskCompletionSource<object>();
+                var rc = Functions.vp_enter(_instance, world.Name);
+                if (rc != 0)
+                {
+                    return Task.FromException(new VpException((ReasonCode)rc));
+                }
+
+                return EnterCompletionSource.Task;
+            }
+        }
+
+        virtual public IAvatar My()
+        {
+            return new Avatar
+            {
+                UserId = Functions.vp_int(_instance, IntegerAttribute.MyUserId),
+                Name = Configuration.BotName,
+                AvatarType = Functions.vp_int(_instance, IntegerAttribute.MyType),
+                Position = new Vector3
+                {
+                    X = Functions.vp_double(_instance, FloatAttribute.MyX),
+                    Y = Functions.vp_double(_instance, FloatAttribute.MyY),
+                    Z = Functions.vp_double(_instance, FloatAttribute.MyZ)
+                },
+                Rotation = new Vector3
+                {
+                    X = Functions.vp_double(_instance, FloatAttribute.MyPitch),
+                    Y = Functions.vp_double(_instance, FloatAttribute.MyYaw),
+                    Z = 0 /* roll currently not supported*/
+                },
+                LastChanged = DateTime.Now
+            };
+        }
+
+        /// <summary>
+        /// Leave the current world
+        /// </summary>
+        virtual public void Leave()
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_leave(_instance));
+                OnWorldLeave?.Invoke(this, new WorldLeaveEventArgs { World = Configuration.World });
+            }
+        }
+
+        virtual public void Disconnect()
+        {
+            _avatars.Clear();
+            Functions.vp_destroy(_instance);
+            _isInitialized = false;
+            InitVpNative();
+            OnUniverseDisconnect?.Invoke(this, new UniverseDisconnectEventArgs { Universe = Universe, DisconnectType = VpNet.DisconnectType.UserDisconnected });
+        }
+
+        virtual public void ListWorlds()
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_list(_instance, 0));
+            }
+        }
+
+        #endregion
+
+        #region IQueryCellFunctions Implementation
+
+        virtual public void QueryCell(int cellX, int cellZ)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_query_cell(_instance, cellX, cellZ));
+            }
+        }
+
+        virtual public void QueryCell(int cellX, int cellZ, int revision)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_query_cell_revision(_instance, cellX, cellZ, revision));
+            }
+        }
+
+        #endregion
+
+        #region IVpObjectFunctions implementations
+
+        public void ClickObject(IVpObject vpObject)
+        {
+            lock (this)
+            {
+                ClickObject(vpObject.Id);
+            }
+        }
+
+        public void ClickObject(int objectId)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_object_click(_instance, objectId, 0, 0, 0, 0));
+            }
+        }
+
+        public void ClickObject(IVpObject vpObject, IAvatar avatar)
+        {
+            lock (this)
+            {
+                ClickObject(vpObject.Id, avatar.Session);
+            }
+        }
+
+        public void ClickObject(IVpObject vpObject, IAvatar avatar, Vector3 worldHit)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_object_click(_instance, vpObject.Id, avatar.Session, (float)worldHit.X, (float)worldHit.Y, (float)worldHit.Z));
+            }
+        }
+
+        public void ClickObject(IVpObject vpObject, Vector3 worldHit)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_object_click(_instance, vpObject.Id, 0, (float)worldHit.X, (float)worldHit.Y, (float)worldHit.Z));
+            }
+        }
+
+        public void ClickObject(int objectId,int toSession, double worldHitX, double worldHitY, double worldHitZ)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_object_click(_instance, objectId, toSession, (float)worldHitX, (float)worldHitY, (float)worldHitZ));
+            }
+        }
+
+        public void ClickObject(int objectId, double worldHitX, double worldHitY, double worldHitZ)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_object_click(_instance, objectId, 0, (float)worldHitX, (float)worldHitY, (float)worldHitZ));
+            }
+        }
+
+        public void ClickObject(int objectId, int toSession)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_object_click(_instance, objectId, toSession, 0, 0, 0));
+            }
+        }
+
+        virtual public Task DeleteObjectAsync(IVpObject vpObject)
+        {
+            var referenceNumber = ObjectReferenceCounter.GetNextReference();
+            var tcs = new TaskCompletionSource<object>();
+            lock (this)
+            {
+                _objectCompletionSources.Add(referenceNumber, tcs);
+                Functions.vp_int_set(_instance, IntegerAttribute.ReferenceNumber, referenceNumber);
+
+                int rc = Functions.vp_object_delete(_instance,vpObject.Id);
+                if (rc != 0)
+                {
+                    _objectCompletionSources.Remove(referenceNumber);
+                    throw new VpException((ReasonCode)rc);
+                }
+            }
+
+            return tcs.Task;
+        }
+
+        virtual public async Task<int> LoadObjectAsync(IVpObject vpObject)
+        {
+            var referenceNumber = ObjectReferenceCounter.GetNextReference();
+            var tcs = new TaskCompletionSource<object>();
+            lock (this)
+            {
+                _objectCompletionSources.Add(referenceNumber, tcs);
+                Functions.vp_int_set(_instance, IntegerAttribute.ReferenceNumber, referenceNumber);
+                Functions.vp_int_set(_instance, IntegerAttribute.ObjectId, vpObject.Id);
+                Functions.vp_string_set(_instance, StringAttribute.ObjectAction, vpObject.Action);
+                Functions.vp_string_set(_instance, StringAttribute.ObjectDescription, vpObject.Description);
+                Functions.vp_string_set(_instance, StringAttribute.ObjectModel, vpObject.Model);
+                Functions.SetData(_instance, DataAttribute.ObjectData, vpObject.Data);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationX, vpObject.Rotation.X);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationY, vpObject.Rotation.Y);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationZ, vpObject.Rotation.Z);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectX, vpObject.Position.X);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectY, vpObject.Position.Y);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectZ, vpObject.Position.Z);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationAngle, vpObject.Angle);
+                Functions.vp_int_set(_instance, IntegerAttribute.ObjectType, vpObject.ObjectType);
+                Functions.vp_int_set(_instance, IntegerAttribute.ObjectUserId, vpObject.Owner);
+                Functions.vp_int_set(_instance, IntegerAttribute.ObjectTime, (int)new DateTimeOffset(vpObject.Time).ToUnixTimeSeconds());
+
+                int rc = Functions.vp_object_load(_instance);
+                if (rc != 0)
+                {
+                    _objectCompletionSources.Remove(referenceNumber);
+                    throw new VpException((ReasonCode)rc);
+                }
+            }
+
+            var id = (int)await tcs.Task.ConfigureAwait(false);
+            vpObject.Id = id;
+
+            return id;
+        }
+
+        virtual public async Task<int> AddObjectAsync(IVpObject vpObject)
+        {
+            var referenceNumber = ObjectReferenceCounter.GetNextReference();
+            var tcs = new TaskCompletionSource<object>();
+            lock (this)
+            {
+                _objectCompletionSources.Add(referenceNumber, tcs);
+                Functions.vp_int_set(_instance, IntegerAttribute.ReferenceNumber, referenceNumber);
+                Functions.vp_int_set(_instance, IntegerAttribute.ObjectId, vpObject.Id);
+                Functions.vp_string_set(_instance, StringAttribute.ObjectAction, vpObject.Action);
+                Functions.vp_string_set(_instance, StringAttribute.ObjectDescription, vpObject.Description);
+                Functions.vp_string_set(_instance, StringAttribute.ObjectModel, vpObject.Model);
+                Functions.SetData(_instance, DataAttribute.ObjectData, vpObject.Data);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationX, vpObject.Rotation.X);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationY, vpObject.Rotation.Y);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationZ, vpObject.Rotation.Z);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectX, vpObject.Position.X);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectY, vpObject.Position.Y);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectZ, vpObject.Position.Z);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationAngle, vpObject.Angle);
+                Functions.vp_int_set(_instance, IntegerAttribute.ObjectType, vpObject.ObjectType);
+
+                int rc = Functions.vp_object_add(_instance);
+                if (rc != 0)
+                {
+                    _objectCompletionSources.Remove(referenceNumber);
+                    throw new VpException((ReasonCode)rc);
+                }
+            }
+
+            var id = (int)await tcs.Task.ConfigureAwait(false);
+            vpObject.Id = id;
+
+            return id;
+        }
+
+        virtual public Task ChangeObjectAsync(IVpObject vpObject)
+        {
+            var referenceNumber = ObjectReferenceCounter.GetNextReference();
+            var tcs = new TaskCompletionSource<object>();
+            lock (this)
+            {
+                _objectCompletionSources.Add(referenceNumber, tcs);
+                Functions.vp_int_set(_instance, IntegerAttribute.ReferenceNumber, referenceNumber);
+                Functions.vp_int_set(_instance, IntegerAttribute.ObjectId, vpObject.Id);
+                Functions.vp_string_set(_instance, StringAttribute.ObjectAction, vpObject.Action);
+                Functions.vp_string_set(_instance, StringAttribute.ObjectDescription, vpObject.Description);
+                Functions.vp_string_set(_instance, StringAttribute.ObjectModel, vpObject.Model);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationX, vpObject.Rotation.X);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationY, vpObject.Rotation.Y);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationZ, vpObject.Rotation.Z);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectX, vpObject.Position.X);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectY, vpObject.Position.Y);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectZ, vpObject.Position.Z);
+                Functions.vp_double_set(_instance, FloatAttribute.ObjectRotationAngle, vpObject.Angle);
+                Functions.vp_int_set(_instance, IntegerAttribute.ObjectType, vpObject.ObjectType);
+
+                int rc = Functions.vp_object_change(_instance);
+                if (rc != 0)
+                {
+                    _objectCompletionSources.Remove(referenceNumber);
+                    throw new VpException((ReasonCode)rc);
+                }
+            }
+
+
+            return tcs.Task;
+        }
+
+        virtual public async Task<IVpObject> GetObjectAsync(int id)
+        {
+            var referenceNumber = ObjectReferenceCounter.GetNextReference();
+            var tcs = new TaskCompletionSource<object>();
+            lock (this)
+            {
+                _objectCompletionSources.Add(referenceNumber, tcs);
+                Functions.vp_int_set(_instance, IntegerAttribute.ReferenceNumber, referenceNumber);
+                var rc = Functions.vp_object_get(_instance, id);
+                if (rc != 0)
+                {
+                    _objectCompletionSources.Remove(referenceNumber);
+                    throw new VpException((ReasonCode)rc);
+                }
+            }
+
+            var obj = (IVpObject)await tcs.Task.ConfigureAwait(false);
+            return obj;
+        }
+
+        #endregion
+
+        #region ITeleportFunctions Implementations
+
+        virtual public void TeleportAvatar(int targetSession, string world, double x, double y, double z, double yaw, double pitch)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_teleport_avatar(_instance, targetSession, world, (float)x, (float)y,
+                                                             (float)z, (float)yaw, (float)pitch));
+            }
+        }
+
+        virtual public void TeleportAvatar(IAvatar avatar, string world, double x, double y, double z, double yaw, double pitch)
+        {
+            TeleportAvatar(avatar.Session, world, (float)x, (float)y, (float)z, (float)yaw, (float)pitch);
+        }
+
+        virtual public void TeleportAvatar(IAvatar avatar, string world, Vector3 position, double yaw, double pitch)
+        {
+            TeleportAvatar(avatar.Session, world, (float)position.X, (float)position.Y, (float)position.Z, (float)yaw, (float)pitch);
+        }
+
+        virtual public void TeleportAvatar(int targetSession, string world, Vector3 position, double yaw, double pitch)
+        {
+            TeleportAvatar(targetSession, world, (float)position.X, (float)position.Y, (float)position.Z, (float)yaw, (float)pitch);
+
+        }
+
+        virtual public void TeleportAvatar(IAvatar avatar, string world, Vector3 position, Vector3 rotation)
+        {
+            TeleportAvatar(avatar.Session, world, (float)position.X, (float)position.Y, (float)position.Z,
+                           (float)rotation.Y, (float)rotation.X);
+        }
+
+        public void TeleportAvatar(IAvatar avatar, IWorld world, Vector3 position, Vector3 rotation)
+        {
+            TeleportAvatar(avatar.Session, world.Name, (float)position.X, (float)position.Y, (float)position.Z,
+                           (float)rotation.Y, (float)rotation.X);
+        }
+
+        virtual public void TeleportAvatar(IAvatar avatar, Vector3 position, Vector3 rotation)
+        {
+            TeleportAvatar(avatar.Session, string.Empty, (float)position.X, (float)position.Y, (float)position.Z,
+                           (float)rotation.Y, (float)rotation.X);
+        }
+
+        virtual public void TeleportAvatar(IAvatar avatar)
+        {
+            TeleportAvatar(avatar.Session, string.Empty, (float)avatar.Position.X, (float)avatar.Position.Y,
+                           (float)avatar.Position.Z, (float)avatar.Rotation.Y, (float)avatar.Rotation.X);
+        }
+
+        #endregion
+
+        #region IAvatarFunctions Implementations.
+
+        virtual public void GetUserProfile(int userId)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_user_attributes_by_id(_instance, userId));
+            }
+        }
+
+        [Obsolete]
+        virtual public void GetUserProfile(string userName)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_user_attributes_by_name(_instance, userName));
+            }
+        }
+
+        virtual public void GetUserProfile(IAvatar profile)
+        {
+            GetUserProfile(profile.UserId);
+        }
+
+        virtual public void UpdateAvatar(double x = 0.0f, double y = 0.0f, double z = 0.0f,double yaw = 0.0f, double pitch = 0.0f)
+        {
+            lock (this)
+            {
+                Functions.vp_double_set(_instance, FloatAttribute.MyX, x);
+                Functions.vp_double_set(_instance, FloatAttribute.MyY, y);
+                Functions.vp_double_set(_instance, FloatAttribute.MyZ, z);
+                Functions.vp_double_set(_instance, FloatAttribute.MyYaw, yaw);
+                Functions.vp_double_set(_instance, FloatAttribute.MyPitch, pitch);
+                CheckReasonCode(Functions.vp_state_change(_instance));
+
+            }
+        }
+
+        public void UpdateAvatar(Vector3 position)
+        {
+            UpdateAvatar(position.X, position.Y, position.Z);
+        }
+
+        public void UpdateAvatar(Vector3 position, Vector3 rotation)
+        {
+            UpdateAvatar(position.X, position.Y, position.Z, rotation.X, rotation.Y);
+        }
+
+        public void AvatarClick(int session)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_avatar_click(_instance, session));
+            }
+        }
+
+        public void AvatarClick(IAvatar avatar)
+        {
+            AvatarClick(avatar.Session);
+        }
+
+        #endregion
+
+        #region IChatFunctions Implementations
+
+        virtual public void Say(string message)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_say(_instance, message));
+            }
+        }
+
+        virtual public void Say(string format, params object[] arg)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_say(_instance, string.Format(format, arg)));
+            }
+        }
+
+        public void ConsoleMessage(int targetSession, string name, string message, TextEffectTypes effects = 0, byte red = 0, byte green = 0, byte blue = 0)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_console_message(_instance, targetSession, name, message, (int)effects, red, green, blue));
+            }
+        }
+
+        public void ConsoleMessage(IAvatar avatar, string name, string message, Color? color, TextEffectTypes effects = 0)
+        {
+            ConsoleMessage(avatar.Session, name, message, effects, color?.R ?? 0, color?.G ?? 0, color?.B ?? 0);
+        }
+
+        public void ConsoleMessage(int targetSession, string name, string message, Color? color, TextEffectTypes effects = 0)
+        {
+            ConsoleMessage(targetSession, name, message, effects, color?.R ?? 0, color?.G ?? 0, color?.B ?? 0);
+        }
+
+        public void ConsoleMessage(string name, string message, Color? color, TextEffectTypes effects = 0)
+        {
+            ConsoleMessage(0, name, message, effects, color?.R ?? 0, color?.G ?? 0, color?.B ?? 0);
+        }
+
+        public void ConsoleMessage(string message, Color? color, TextEffectTypes effects = 0)
+        {
+            ConsoleMessage(0, string.Empty, message, effects, color?.R ?? 0, color?.G ?? 0, color?.B ?? 0);
+        }
+
+        public void ConsoleMessage(string message)
+        {
+            ConsoleMessage(0, string.Empty, message, 0, 0, 0, 0);
+        }
+
+        virtual public void ConsoleMessage(IAvatar avatar, string name, string message, TextEffectTypes effects = 0, byte red = 0, byte green = 0, byte blue = 0)
+        {
+            ConsoleMessage(avatar.Session, name, message, effects, red, green, blue);
+        }
+
+        virtual public void UrlSendOverlay(IAvatar avatar, string url)
+        {
+            UrlSendOverlay(avatar.Session, url);
+        }
+
+        virtual public void UrlSendOverlay(IAvatar avatar, Uri url)
+        {
+            UrlSendOverlay(avatar.Session, url.AbsoluteUri);
+        }
+
+        virtual public void UrlSendOverlay(int avatarSession, string url)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_url_send(_instance, avatarSession, url, (int)UrlTarget.UrlTargetOverlay));
+            }
+        }
+
+        virtual public void UrlSendOverlay(int avatarSession, Uri url)
+        {
+            UrlSendOverlay(avatarSession, url.AbsoluteUri);
+        }
+
+        virtual public void UrlSend(IAvatar avatar, string url)
+        {
+            UrlSend(avatar.Session, url);
+        }
+
+        virtual public void UrlSend(IAvatar avatar, Uri url)
+        {
+            UrlSend(avatar.Session, url.AbsoluteUri);
+        }
+
+        virtual public void UrlSend(int avatarSession, string url)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_url_send(_instance, avatarSession, url, (int)UrlTarget.UrlTargetBrowser));
+            }
+        }
+
+        virtual public void UrlSend(int avatarSession, Uri url)
+        {
+            UrlSend(avatarSession, url.AbsoluteUri);
+        }
+
+        #endregion
+
+        #region IJoinFunctions Implementations
+        public virtual void Join(IAvatar avatar)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_join(_instance, avatar.UserId));
+            }
+        }
+
+        public virtual void Join(int userId)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_join(_instance, userId));
+            }
+        }
+
+
+        public virtual void JoinAccept(int requestId, string world, Vector3 location, float yaw, float pitch)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_join_accept(_instance, requestId, world,location.X,location.Y,location.Z,yaw,pitch));
+            }
+        }
+
+        public virtual void JoinAccept(int requestId, string world, double x, double y, double z, float yaw, float pitch)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_join_accept(_instance, requestId, world, x, y, z, yaw, pitch));
+            }
+        }
+
+        public virtual void JoinDecline(int requestId)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_join_decline(_instance, requestId));
+            }
+        }
+
+        #endregion
+
+        #region  IWorldPermissionFunctions Implementations
+
+        public virtual void WorldPermissionUser(string permission, int userId, int enable)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, permission, userId, enable));
+            }
+        }
+
+        public virtual void WorldPermissionUserEnable(WorldPermissions permission, IAvatar avatar)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission),avatar.UserId,1));
+            }
+        }
+
+        public virtual void WorldPermissionUserEnable(WorldPermissions permission, int userId)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), userId, 1));
+            }
+        }
+
+        public virtual void WorldPermissionUserDisable(WorldPermissions permission, IAvatar avatar)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), avatar.UserId, 0));
+            }
+        }
+
+        public virtual void WorldPermissionUserDisable(WorldPermissions permission, int userId)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), userId, 0));
+            }
+        }
+
+        public virtual void WorldPermissionSession(string permission, int sessionId, int enable)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_permission_session_set(_instance, permission, sessionId, enable));
+            }
+        }
+
+        public virtual void WorldPermissionSessionEnable(WorldPermissions permission, IAvatar avatar)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), avatar.Session, 1));
+            }
+        }
+
+        public virtual void WorldPermissionSessionEnable(WorldPermissions permission, int session)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), session, 1));
+            }
+        }
+
+
+        public virtual void WorldPermissionSessionDisable(WorldPermissions permission, IAvatar avatar)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), avatar.Session, 0));
+            }
+        }
+
+        public virtual void WorldPermissionSessionDisable(WorldPermissions permission, int session)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_permission_user_set(_instance, Enum.GetName(typeof(WorldPermissions), permission), session, 0));
+            }
+        }
+
+        #endregion
+
+        #region IWorldSettingsFunctions Implementations
+
+        public virtual void WorldSettingSession(string setting, string value, IAvatar toAvatar)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_setting_set(_instance, setting, value, toAvatar.Session));
+            }
+        }
+
+        public virtual void WorldSettingSession(string setting, string value, int  toSession)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_world_setting_set(_instance, setting, value, toSession));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Events
+
+        private readonly Dictionary<Events, EventDelegate> _nativeEvents = new Dictionary<Events, EventDelegate>();
+        private readonly Dictionary<Callbacks, CallbackDelegate> _nativeCallbacks = new Dictionary<Callbacks, CallbackDelegate>();
+
+
+
+
+
+        private void SetNativeEvent(Events eventType, EventDelegate eventFunction)
+        {
+            _nativeEvents[eventType] = eventFunction;
+            Functions.vp_event_set(_instance, (int)eventType, eventFunction);
+        }
+
+        private void SetNativeCallback(Callbacks callbackType, CallbackDelegate callbackFunction)
+        {
+            _nativeCallbacks[callbackType] = callbackFunction;
+            Functions.vp_callback_set(_instance, (int)callbackType, callbackFunction);
+        }
+
+        //public delegate void Event(T sender);
+        public delegate void ChatMessageDelegate(Instance sender, ChatMessageEventArgs args);
+
+        public delegate void AvatarChangeDelegate(Instance sender, AvatarChangeEventArgs args);
+        public delegate void AvatarEnterDelegate(Instance sender, AvatarEnterEventArgs args);
+        public delegate void AvatarLeaveDelegate(Instance sender, AvatarLeaveEventArgs args);
+        public delegate void AvatarClickDelegate(Instance sender, AvatarClickEventArgs args);
+
+        public delegate void TeleportDelegate(Instance sender, TeleportEventArgs args);
+
+        public delegate void UserAttributesDelegate(Instance sender, UserAttributesEventArgs args);
+
+        public delegate void WorldListEventDelegate(Instance sender, WorldListEventArgs args);
+
+        public delegate void ObjectCreateDelegate(Instance sender, ObjectCreateArgs args);
+        public delegate void ObjectChangeDelegate(Instance sender, ObjectChangeArgs args);
+        public delegate void ObjectDeleteDelegate(Instance sender, ObjectDeleteArgs args);
+        public delegate void ObjectClickDelegate(Instance sender, ObjectClickArgs args);
+        public delegate void ObjectBumpDelegate(Instance sender, ObjectBumpArgs args);
+
+        public delegate void QueryCellResultDelegate(Instance sender, QueryCellResultArgs args);
+        public delegate void QueryCellEndDelegate(Instance sender, QueryCellEndArgs args);
+
+        public delegate void WorldSettingsChangedDelegate(Instance sender, WorldSettingsChangedEventArgs args);
+        public delegate void WorldDisconnectDelegate(Instance sender, WorldDisconnectEventArgs args);
+
+        public delegate void UniverseDisconnectDelegate(Instance sender, UniverseDisconnectEventArgs args);
+        public delegate void JoinDelegate(Instance sender, JoinEventArgs args);
+
+        public delegate void FriendAddCallbackDelegate(Instance sender, FriendAddCallbackEventArgs args);
+        public delegate void FriendDeleteCallbackDelegate(Instance sender, FriendDeleteCallbackEventArgs args);
+        public delegate void FriendsGetCallbackDelegate(Instance sender, FriendsGetCallbackEventArgs args);
+
+        public event ChatMessageDelegate OnChatMessage;
+        public event AvatarEnterDelegate OnAvatarEnter;
+        public event AvatarChangeDelegate OnAvatarChange;
+        public event AvatarLeaveDelegate OnAvatarLeave;
+        public event AvatarClickDelegate OnAvatarClick;
+        public event JoinDelegate OnJoin;
+
+        public event TeleportDelegate OnTeleport;
+        public event UserAttributesDelegate OnUserAttributes;
+
+        public event ObjectCreateDelegate OnObjectCreate;
+        public event ObjectChangeDelegate OnObjectChange;
+        public event ObjectDeleteDelegate OnObjectDelete;
+        public event ObjectClickDelegate OnObjectClick;
+        public event ObjectBumpDelegate OnObjectBump;
+
+
+        public event WorldListEventDelegate OnWorldList;
+        public event WorldSettingsChangedDelegate OnWorldSettingsChanged;
+        public event FriendAddCallbackDelegate OnFriendAddCallback;
+        public event FriendsGetCallbackDelegate OnFriendsGetCallback;
+
+        public event WorldDisconnectDelegate OnWorldDisconnect;
+        public event UniverseDisconnectDelegate OnUniverseDisconnect;
+
+        public event QueryCellResultDelegate OnQueryCellResult;
+        public event QueryCellEndDelegate OnQueryCellEnd;
+
+        /* Events indirectly assosicated with VP */
+
+        public delegate void WorldEnterDelegate(Instance sender, WorldEnterEventArgs args);
+        public event WorldEnterDelegate OnWorldEnter;
+        public delegate void WorldLeaveDelegate(Instance sender, WorldLeaveEventArgs args);
+        public event WorldLeaveDelegate OnWorldLeave;
+
+        #endregion
+
+        #region CallbackHandlers
+
+        private void OnObjectCreateCallbackNative(IntPtr sender, int rc, int reference)
+        {
+            lock (this)
+            {
+                SetCompletionResult(reference, rc, Functions.vp_int(sender, IntegerAttribute.ObjectId));
+            }
+        }
+
+        private void OnObjectChangeCallbackNative(IntPtr sender, int rc, int reference)
+        {
+            lock (this)
+            {
+                SetCompletionResult(reference, rc, null);
+            }
+        }
+
+        private void OnObjectDeleteCallbackNative(IntPtr sender, int rc, int reference)
+        {
+            lock (this)
+            {
+                SetCompletionResult(reference, rc, null);
+            }
+        }
+
+        void OnObjectGetCallbackNative(IntPtr sender, int rc, int reference)
+        {
+            lock (this)
+            {
+                GetVpObject(sender, out IVpObject vpObject);
+
+                SetCompletionResult(reference, rc, vpObject);
+            }
+        }
+
+        private void OnObjectLoadCallbackNative(IntPtr sender, int rc, int reference)
+        {
+            lock (this)
+            {
+                SetCompletionResult(reference, rc, Functions.vp_int(sender, IntegerAttribute.ObjectId));
+            }
+        }
+        #endregion
+
+        #region Event handlers
+
+        private void OnUserAttributesNative(IntPtr sender)
+        {
+            if (OnUserAttributes == null)
+                return;
+            IUserAttributes att;
+            lock (this)
+            {
+                att = new UserAttributes()
+                          {
+                              Email = Functions.vp_string(sender, StringAttribute.UserEmail),
+                              Id = Functions.vp_int(sender, IntegerAttribute.UserId),
+                              LastLogin = DateTimeOffset.FromUnixTimeSeconds(Functions.vp_int(sender, IntegerAttribute.UserLastLogin)).UtcDateTime,
+                              Name = Functions.vp_string(sender, StringAttribute.UserName),
+                              OnlineTime = new TimeSpan(0, 0, 0, Functions.vp_int(sender, IntegerAttribute.UserOnlineTime)),
+                              RegistrationDate = DateTimeOffset.FromUnixTimeSeconds(Functions.vp_int(sender, IntegerAttribute.UserRegistrationTime)).UtcDateTime
+                          };
+            }
+            OnUserAttributes(this,new UserAttributesEventArgs(){UserAttributes = att});
+        }
+
+        private void OnTeleportNative(IntPtr sender)
+        {
+            if (OnTeleport == null)
+                return;
+            ITeleport teleport;
+            lock (this)
+            {
+                teleport = new Teleport
+                    {
+                        Avatar = GetAvatar(Functions.vp_int(sender, IntegerAttribute.AvatarSession)),
+                        Position = new Vector3
+                            {
+                                X = Functions.vp_double(sender, FloatAttribute.TeleportX),
+                                Y = Functions.vp_double(sender, FloatAttribute.TeleportY),
+                                Z = Functions.vp_double(sender, FloatAttribute.TeleportZ)
+                            },
+                        Rotation = new Vector3
+                            {
+                                X = Functions.vp_double(sender, FloatAttribute.TeleportPitch),
+                                Y = Functions.vp_double(sender, FloatAttribute.TeleportYaw),
+                                Z = 0 /* Roll not implemented yet */
+                            },
+                            // TODO: maintain user count and world state statistics.
+                        World = new World { Name = Functions.vp_string(sender, StringAttribute.TeleportWorld),State = WorldState.Unknown, UserCount=-1 }
+                    };
+            }
+            OnTeleport(this, new TeleportEventArgs() {Teleport = teleport});
+        }
+
+        private void OnGetFriendsCallbackNative(IntPtr sender, int rc, int reference)
+        {
+            if (OnFriendAddCallback == null)
+                return;
+            lock (this)
+            {
+                var friend = new Friend
+                {
+                    UserId = Functions.vp_int(sender, IntegerAttribute.UserId),
+                    Name = Functions.vp_string(sender, StringAttribute.FriendName),
+                    Online = Functions.vp_int(sender, IntegerAttribute.FriendOnline) == 1
+                };
+                OnFriendsGetCallback(this, new FriendsGetCallbackEventArgs { Friend = friend });
+            }
+        }
+
+        private void OnFriendDeleteCallbackNative(IntPtr sender, int rc, int reference)
+        {
+            // todo: implement this.
+        }
+
+        private void OnFriendAddCallbackNative(IntPtr sender, int rc, int reference)
+        {
+            // todo: implement this.
+        }
+
+
+        private void OnChatNative(IntPtr sender)
+        {
+            ChatMessageEventArgs data;
+            lock (this)
+            {
+                if (!_avatars.ContainsKey(Functions.vp_int(sender, IntegerAttribute.AvatarSession)))
+                {
+                    var avatar = new Avatar
+                        {
+                            Name = Functions.vp_string(sender, StringAttribute.AvatarName),
+                            Session = Functions.vp_int(sender, IntegerAttribute.AvatarSession)
+                        };
+                    _avatars.Add(avatar.Session, avatar);
+                }
+                data = new ChatMessageEventArgs
+                {
+                    Avatar = _avatars[Functions.vp_int(sender, IntegerAttribute.AvatarSession)],
+                    ChatMessage = new ChatMessage()
+                    {
+                        Type = (ChatMessageTypes)Functions.vp_int(sender, IntegerAttribute.ChatType),
+                        Message = Functions.vp_string(sender, StringAttribute.ChatMessage),
+                        Name = Functions.vp_string(sender, StringAttribute.AvatarName),
+                        TextEffectTypes = (TextEffectTypes)Functions.vp_int(sender, IntegerAttribute.ChatEffects)
+                    }
+                };
+                OperatingSystem os = Environment.OSVersion;
+
+                if (OnChatMessage == null) return;
+                if (data.ChatMessage.Type == ChatMessageTypes.Console)
+                {
+                    data.ChatMessage.Color = new Color
+                    {
+                        R = (byte)Functions.vp_int(sender, IntegerAttribute.ChatRolorRed),
+                        G = (byte)Functions.vp_int(sender, IntegerAttribute.ChatColorGreen),
+                        B = (byte)Functions.vp_int(sender, IntegerAttribute.ChatColorBlue)
+                    };
+                }
+                else
+                {
+                    data.ChatMessage.Color = new Color
+                    {
+                        R = 0,
+                        G = 0,
+                        B = 0
+                    };
+                }
+            }
+            OnChatMessage(this, data);
+        }
+
+        private void OnAvatarAddNative(IntPtr sender)
+        {
+            IAvatar data;
+            lock (this)
+            {
+                data = new Avatar()
+                {
+                    UserId = Functions.vp_int(sender, IntegerAttribute.UserId),
+                    Name = Functions.vp_string(sender, StringAttribute.AvatarName),
+                    Session = Functions.vp_int(sender, IntegerAttribute.AvatarSession),
+                    AvatarType = Functions.vp_int(sender, IntegerAttribute.AvatarType),
+                    Position = new Vector3
+                    {
+                        X = Functions.vp_double(sender, FloatAttribute.AvatarX),
+                        Y = Functions.vp_double(sender, FloatAttribute.AvatarY),
+                        Z = Functions.vp_double(sender, FloatAttribute.AvatarZ)
+                    },
+                    Rotation = new Vector3
+                    {
+                        X = Functions.vp_double(sender, FloatAttribute.AvatarPitch),
+                        Y = Functions.vp_double(sender, FloatAttribute.AvatarYaw),
+                        Z = 0 /* roll currently not supported*/
+                    },
+                    ApplicationName = Functions.vp_string(sender, StringAttribute.AvatarApplicationName),
+                    ApplicationVersion = Functions.vp_string(sender, StringAttribute.AvatarApplicationVersion)
+                };
+                if (!_avatars.ContainsKey(data.Session))
+                    _avatars.Add(data.Session, data);
+            }
+            data.LastChanged = DateTime.UtcNow;
+            if (OnAvatarEnter == null) return;
+            var args = new AvatarEnterEventArgs {Avatar = data, Implementor = this};
+            args.Initialize();
+            OnAvatarEnter(this, args);
+        }
+
+        private void OnAvatarChangeNative(IntPtr sender)
+        {
+            IAvatar old;
+            IAvatar data;
+            lock (this)
+            {
+                data = new Avatar()
+                {
+                    UserId = _avatars[Functions.vp_int(sender, IntegerAttribute.AvatarSession)].UserId,
+                    Name = Functions.vp_string(sender, StringAttribute.AvatarName),
+                    Session = Functions.vp_int(sender, IntegerAttribute.AvatarSession),
+                    AvatarType = Functions.vp_int(sender, IntegerAttribute.AvatarType),
+                    Position = new Vector3
+                    {
+                        X = Functions.vp_double(sender, FloatAttribute.AvatarX),
+                        Y = Functions.vp_double(sender, FloatAttribute.AvatarY),
+                        Z = Functions.vp_double(sender, FloatAttribute.AvatarZ)
+                    },
+                    Rotation = new Vector3
+                    {
+                        X = Functions.vp_double(sender, FloatAttribute.AvatarPitch),
+                        Y = Functions.vp_double(sender, FloatAttribute.AvatarYaw),
+                        Z = 0 /* roll currently not supported*/
+                    }
+                };
+                // determine if the avatar actually changed.
+                old = new Avatar().CopyFrom(_avatars[data.Session], true);
+                if (data.Position.X == old.Position.X
+                    && data.Position.Y == old.Position.Y
+                    && data.Position.Z == old.Position.Z
+                    && data.Rotation.X == old.Rotation.X
+                    && data.Rotation.Y == old.Rotation.Y
+                    && data.Rotation.Z == old.Rotation.Z)
+                    return;
+                data.LastChanged = DateTime.UtcNow;
+                SetAvatar(data);
+
+            }
+            OnAvatarChange?.Invoke(this, new AvatarChangeEventArgs { Avatar = _avatars[data.Session], AvatarPrevious = old });
+        }
+
+        private void OnAvatarDeleteNative(IntPtr sender)
+        {
+            IAvatar data;
+            lock (this)
+            {
+                try
+                {
+                    data = _avatars[Functions.vp_int(sender, IntegerAttribute.AvatarSession)];
+                    _avatars.Remove(data.Session);
+                    if (OnAvatarLeave == null) return;
+                    OnAvatarLeave(this, new AvatarLeaveEventArgs { Avatar = data });
+                }
+                catch
+                {
+
+                }
+            }
+        }
+
+        private void OnAvatarClickNative(IntPtr sender)
+        {
+            if (OnAvatarClick == null) return;
+            lock (this)
+            {
+                var clickedAvatar = Functions.vp_int(sender, IntegerAttribute.ClickedSession);
+                if (clickedAvatar == 0)
+                    clickedAvatar = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
+
+                OnAvatarClick(this,
+                    new AvatarClickEventArgs
+                    {
+                        Avatar = GetAvatar(Functions.vp_int(sender, IntegerAttribute.AvatarSession)),
+                        ClickedAvatar = GetAvatar(clickedAvatar),
+                        WorldHit = new Vector3
+                        {
+                            X = Functions.vp_double(sender, FloatAttribute.ClickHitX),
+                            Y = Functions.vp_double(sender, FloatAttribute.ClickHitY),
+                            Z = Functions.vp_double(sender, FloatAttribute.ClickHitZ)
+                        }
+                    });
+            }
+        }
+
+        private void OnObjectClickNative(IntPtr sender)
+        {
+            if (OnObjectClick == null) return;
+            int session;
+            int objectId;
+            Vector3 world;
+            lock (this)
+            {
+                session = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
+                objectId = Functions.vp_int(sender, IntegerAttribute.ObjectId);
+                world = new Vector3
+                    {
+                        X = Functions.vp_double(sender, FloatAttribute.ClickHitX),
+                        Y = Functions.vp_double(sender, FloatAttribute.ClickHitY),
+                        Z = Functions.vp_double(sender, FloatAttribute.ClickHitZ)
+                    };
+            }
+
+            OnObjectClick(this,
+                          new ObjectClickArgs
+                              {WorldHit=world, Avatar = GetAvatar(session), VpObject = new VpObject {Id = objectId}});
+        }
+
+        private void OnObjectBumpNative(IntPtr sender)
+        {
+            if (OnObjectBump == null) return;
+            int session;
+            int objectId;
+            lock (this)
+            {
+                session = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
+                objectId = Functions.vp_int(sender, IntegerAttribute.ObjectId);
+            }
+
+            OnObjectBump(this,
+                          new ObjectBumpArgs { BumpType = BumpType.BumpBegin, Avatar = GetAvatar(session), VpObject = new VpObject { Id = objectId } });
+        }
+
+        private void OnObjectBumpEndNative(IntPtr sender)
+        {
+            if (OnObjectBump == null) return;
+            int session;
+            int objectId;
+            lock (this)
+            {
+                session = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
+                objectId = Functions.vp_int(sender, IntegerAttribute.ObjectId);
+            }
+
+            OnObjectBump(this,
+                          new ObjectBumpArgs { BumpType = BumpType.BumpEnd, Avatar = GetAvatar(session), VpObject = new VpObject { Id = objectId } });
+        }
+
+        private void OnObjectDeleteNative(IntPtr sender)
+        {
+            if (OnObjectDelete == null) return;
+            int session;
+            int objectId;
+            lock (this)
+            {
+                session = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
+                objectId = Functions.vp_int(sender, IntegerAttribute.ObjectId);
+            }
+            OnObjectDelete(this, new ObjectDeleteArgs { Avatar = GetAvatar(session), VpObject = new VpObject { Id = objectId } });
+        }
+
+        private void OnObjectCreateNative(IntPtr sender)
+        {
+            if (OnObjectCreate == null && OnQueryCellResult == null) return;
+            IVpObject vpObject;
+            int session;
+            lock (this)
+            {
+                session = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
+                GetVpObject(sender, out vpObject);
+            }
+            if (session == 0 && OnQueryCellResult != null)
+                OnQueryCellResult(this, new QueryCellResultArgs { VpObject = vpObject });
+            else
+                OnObjectCreate?.Invoke(this, new ObjectCreateArgs { Avatar = GetAvatar(session), VpObject = vpObject });
+        }
+
+
+
+        public List<IAvatar> Avatars()
+        {
+            return _avatars.Values.ToList();
+        }
+
+        [Obsolete("Objects are not firewalled anymore, so commits are not needed.")]
+        public void Commit(IAvatar avatar)
+        {
+            //lock (_avatars)
+            //{
+            //    var cache = _avatars[avatar.Session];
+            //    cache.CopyFrom(avatar, false);
+            //    foreach (var prop in cache.GetType().GetFields())
+            //    {
+            //        if (prop.FieldType.BaseType!=null && prop.FieldType.BaseType.Name.StartsWith("BaseInstanceT"))
+            //            prop.SetValue(cache, this);
+            //    }
+            //    _avatars[avatar.Session] = cache;
+            //}
+        }
+
+        public IAvatar GetAvatar(int session)
+        {
+            if (_avatars.ContainsKey(session))
+                return _avatars[session];
+            var avatar = new Avatar { Session = session };
+            _avatars.Add(session, avatar);
+            return avatar;
+        }
+
+        private void SetAvatar(IAvatar avatar)
+        {
+            lock (this)
+            {
+                if (_avatars.ContainsKey(avatar.Session))
+                {
+                    ((Avatar)_avatars[avatar.Session]).CopyFrom(avatar, true);
+                }
+                else
+                {
+                    _avatars[avatar.Session] = avatar;
+                }
+            }
+        }
+
+        private static void GetVpObject(IntPtr sender, out IVpObject vpObject)
+        {
+            vpObject = new VpObject
+            {
+                Action = Functions.vp_string(sender, StringAttribute.ObjectAction),
+                Description = Functions.vp_string(sender, StringAttribute.ObjectDescription),
+                Id = Functions.vp_int(sender, IntegerAttribute.ObjectId),
+                Model = Functions.vp_string(sender, StringAttribute.ObjectModel),
+                Data = Functions.GetData(sender, DataAttribute.ObjectData),
+
+                Rotation = new Vector3
+                {
+                    X = Functions.vp_double(sender, FloatAttribute.ObjectRotationX),
+                    Y = Functions.vp_double(sender, FloatAttribute.ObjectRotationY),
+                    Z = Functions.vp_double(sender, FloatAttribute.ObjectRotationZ)
+                },
+
+                Time = DateTimeOffset.FromUnixTimeSeconds(Functions.vp_int(sender, IntegerAttribute.ObjectTime)).UtcDateTime,
+                ObjectType = Functions.vp_int(sender, IntegerAttribute.ObjectType),
+                Owner = Functions.vp_int(sender, IntegerAttribute.ObjectUserId),
+                Position = new Vector3
+                {
+                    X = Functions.vp_double(sender, FloatAttribute.ObjectX),
+                    Y = Functions.vp_double(sender, FloatAttribute.ObjectY),
+                    Z = Functions.vp_double(sender, FloatAttribute.ObjectZ)
+                },
+                Angle = Functions.vp_double(sender, FloatAttribute.ObjectRotationAngle)
+            };
+        }
+
+        private void OnObjectChangeNative(IntPtr sender)
+        {
+            if (OnObjectChange == null) return;
+            IVpObject vpObject;
+            int sessionId;
+            lock (this)
+            {
+                GetVpObject(sender,out vpObject);
+                sessionId = Functions.vp_int(sender, IntegerAttribute.AvatarSession);
+            }
+            OnObjectChange(this, new ObjectChangeArgs { Avatar = GetAvatar(sessionId), VpObject = vpObject });
+        }
+
+        private void OnQueryCellEndNative(IntPtr sender)
+        {
+            if (OnQueryCellEnd == null) return;
+            int x;
+            int z;
+            lock (this)
+            {
+                x = Functions.vp_int(sender, IntegerAttribute.CellX);
+                z = Functions.vp_int(sender, IntegerAttribute.CellZ);
+            }
+            OnQueryCellEnd(this, new QueryCellEndArgs { Cell = new Cell { X = x, Z = z } });
+        }
+
+        private void OnWorldListNative(IntPtr sender)
+        {
+            if (OnWorldList == null)
+                return;
+
+            IWorld data;
+            lock (this)
+            {
+                string worldName = Functions.vp_string(_instance, StringAttribute.WorldName);
+                data = new World()
+                {
+                    Name = worldName,
+                    State = (WorldState)Functions.vp_int(_instance, IntegerAttribute.WorldState),
+                    UserCount = Functions.vp_int(_instance, IntegerAttribute.WorldUsers)
+                };
+            }
+            if (_worlds.ContainsKey(data.Name))
+                _worlds.Remove(data.Name);
+            _worlds.Add(data.Name,data);
+            OnWorldList(this, new WorldListEventArgs { World = data as World });
+        }
+
+        private void OnWorldSettingNativeEvent(IntPtr instance)
+        {
+            if (!_worlds.ContainsKey(Configuration.World.Name))
+            {
+                _worlds.Add(Configuration.World.Name,Configuration.World);
+            }
+            var world = _worlds[Configuration.World.Name];
+            var key = Functions.vp_string(instance, StringAttribute.WorldSettingKey);
+            var value = Functions.vp_string(instance, StringAttribute.WorldSettingValue);
+            world.RawAttributes[key] = value;
+        }
+
+        private void OnWorldSettingsChangedNativeEvent(IntPtr instance)
+        {
+            // Initialize World Object Cache if a local object path has been specified and a objectpath is speficied in the world attributes.
+            // TODO: some world, such as Test do not specify a objectpath, maybe there's a default search path we dont know of.
+            var world = _worlds[Configuration.World.Name];
+
+            OnWorldSettingsChanged?.Invoke(this, new WorldSettingsChangedEventArgs { World = (World)_worlds[Configuration.World.Name] });
+        }
+
+        private void OnUniverseDisconnectNative(IntPtr sender)
+        {
+            if (OnUniverseDisconnect == null) return;
+            OnUniverseDisconnect(this, new UniverseDisconnectEventArgs { Universe = Universe });
+        }
+
+        private void OnWorldDisconnectNative(IntPtr sender)
+        {
+            if (OnWorldDisconnect == null) return;
+            OnWorldDisconnect(this, new WorldDisconnectEventArgs { World = (World) World });
+        }
+
+        private void OnJoinNative(IntPtr sender)
+        {
+            if (OnJoin == null) return;
+            OnJoin(this, new JoinEventArgs {
+                UserId = Functions.vp_int(sender, IntegerAttribute.UserId),
+                Id = Functions.vp_int(sender, IntegerAttribute.JoinId),
+                Name = Functions.vp_string(sender, StringAttribute.JoinName)
+            });
+        }
+
+        #endregion
+
+        #region Cleanup
+
+        public void ReleaseEvents()
+        {
+            lock (this)
+            {
+                OnChatMessage = null;
+                OnAvatarEnter = null;
+                OnAvatarChange = null;
+                OnAvatarLeave = null;
+                OnObjectCreate = null;
+                OnObjectChange = null;
+                OnObjectDelete = null;
+                OnObjectClick = null;
+                OnObjectBump = null;
+                OnWorldList = null;
+                OnWorldDisconnect = null;
+                OnWorldSettingsChanged = null;
+                OnWorldDisconnect = null;
+                OnUniverseDisconnect = null;
+                //OnUserAttributes = null;
+                OnQueryCellResult = null;
+                OnQueryCellEnd = null;
+                OnFriendAddCallback = null;
+                OnFriendsGetCallback = null;
+            }
+        }
+
+        public void Dispose()
+        {
+            if (_instance != IntPtr.Zero)
+            {
+                Functions.vp_destroy(_instance);
+            }
+
+            if (instanceHandle != null)
+            {
+                instanceHandle.Free();
+            }
+
+            GC.SuppressFinalize(this);
+        }
+
+        #endregion
+
+        #region Friend Functions
+
+        public void GetFriends()
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_friends_get(_instance));
+            }
+        }
+
+        public void AddFriendByName(IFriend friend)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_friend_add_by_name(_instance, friend.Name));
+            }
+        }
+
+        public void AddFriendByName(string name)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_friend_add_by_name(_instance, name));
+            }
+        }
+
+        public void DeleteFriendById(int friendId)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_friend_delete(_instance, friendId));
+            }
+        }
+
+        public void DeleteFriendById(IFriend friend)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_friend_delete(_instance, friend.UserId));
+            }
+        }
+
+        #endregion
+
+        #region ITerrainFunctions Implementation
+
+        public void TerrianQuery(int tileX, int tileZ, int[,] nodes)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_terrain_query(_instance, tileX, tileZ, nodes));
+            }
+        }
+
+        public void SetTerrainNode(int tileX, int tileZ, int nodeX, int nodeZ, TerrainCell[,] cells)
+        {
+            lock (this)
+            {
+                CheckReasonCode(Functions.vp_terrain_node_set(_instance, tileX, tileZ, nodeX, nodeZ, cells));
+            }
+        }
+
+        #endregion
+
+        #region Implementation of IInstanceEvents
+        
+        internal event EventDelegate OnChatNativeEvent;
+        internal event EventDelegate OnAvatarAddNativeEvent;
+        internal event EventDelegate OnAvatarDeleteNativeEvent;
+        internal event EventDelegate OnAvatarChangeNativeEvent;
+        internal event EventDelegate OnAvatarClickNativeEvent;
+        internal event EventDelegate OnWorldListNativeEvent;
+        internal event EventDelegate OnObjectChangeNativeEvent;
+        internal event EventDelegate OnObjectCreateNativeEvent;
+        internal event EventDelegate OnObjectDeleteNativeEvent;
+        internal event EventDelegate OnObjectClickNativeEvent;
+        internal event EventDelegate OnObjectBumpNativeEvent;
+        internal event EventDelegate OnObjectBumpEndNativeEvent;
+        internal event EventDelegate OnQueryCellEndNativeEvent;
+        internal event EventDelegate OnUniverseDisconnectNativeEvent;
+        internal event EventDelegate OnWorldDisconnectNativeEvent;
+        internal event EventDelegate OnTeleportNativeEvent;
+        internal event EventDelegate OnUserAttributesNativeEvent;
+        internal event EventDelegate OnJoinNativeEvent;
+
+        internal event CallbackDelegate OnObjectCreateCallbackNativeEvent;
+        internal event CallbackDelegate OnObjectChangeCallbackNativeEvent;
+        internal event CallbackDelegate OnObjectDeleteCallbackNativeEvent;
+        internal event CallbackDelegate OnObjectGetCallbackNativeEvent;
+        internal event CallbackDelegate OnObjectLoadCallbackNativeEvent;
+        internal event CallbackDelegate OnFriendAddCallbackNativeEvent;
+        internal event CallbackDelegate OnFriendDeleteCallbackNativeEvent;
+        internal event CallbackDelegate OnGetFriendsCallbackNativeEvent;
+
+        internal event CallbackDelegate OnJoinCallbackNativeEvent;
+        internal event CallbackDelegate OnWorldPermissionUserSetCallbackNativeEvent;
+        internal event CallbackDelegate OnWorldPermissionSessionSetCallbackNativeEvent;
+        internal event CallbackDelegate OnWorldSettingsSetCallbackNativeEvent;
+        
+        #endregion
+   
+        public InstanceConfiguration Configuration { get; private set; }
+
+
+    }
+}
diff --git a/VpNet/ManagedApi/Scene/Abstract/BaseColor.cs b/VpNet/ManagedApi/Scene/Abstract/BaseColor.cs
deleted file mode 100644
index 701c5ff..0000000
--- a/VpNet/ManagedApi/Scene/Abstract/BaseColor.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Xml.Serialization;
-
-namespace VpNet.Abstract
-{
-    [Serializable]
-    public abstract class BaseColor
-    {
-        [XmlAttribute]
-        public byte R { get; set; }
-
-        [XmlAttribute]
-        public byte G { get; set; }
-
-        [XmlAttribute]
-        public byte B { get; set; }
-
-        protected BaseColor() { }
-
-        protected BaseColor(byte r, byte g, byte b)
-        {
-            R = r;
-            G = g;
-            B = b;
-        }
-    }
-}
\ No newline at end of file
diff --git a/VpNet/ManagedApi/Scene/Color.cs b/VpNet/ManagedApi/Scene/Color.cs
index b39291a..0a7f19f 100644
--- a/VpNet/ManagedApi/Scene/Color.cs
+++ b/VpNet/ManagedApi/Scene/Color.cs
@@ -1,16 +1,140 @@
 using System;
+using System.Globalization;
+using System.Text;
 using System.Xml.Serialization;
 
 namespace VpNet
 {
+
+    /// <summary>
+    ///     Represents an RGB (red, green, blue) color which uses <see cref="byte" /> components.
+    /// </summary>
     [Serializable]
     [XmlRoot("Color", Namespace = Global.XmlNsScene)]
-    public class Color : Abstract.BaseColor
+    public struct Color : IEquatable<Color>
     {
-        public Color() { }
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="Color" /> struct.
+        /// </summary>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        /// <param name="b"></param>
+        public Color(byte r, byte g, byte b)
+        {
+            this.R = r;
+            this.G = g;
+            this.B = b;
+        }
+
+        /// <summary>
+        ///     Gets or sets the red component value of this color.
+        /// </summary>
+        [XmlAttribute]
+        public byte R { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the green component value of this color.
+        /// </summary>
+        [XmlAttribute]
+        public byte G { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the blue component value of this color.
+        /// </summary>
+        [XmlAttribute]
+        public byte B { get; set; }
+
+        /// <summary>
+        ///     Returns a boolean indicating whether the two given colors are equal.
+        /// </summary>
+        /// <param name="left">The first color to compare.</param>
+        /// <param name="right">The second color to compare.</param>
+        /// <returns><see langword="true" /> if the color are equal; <see langword="false" /> otherwise.</returns>
+        public static bool operator ==(Color left, Color right)
+        {
+            return left.R == right.R &&
+                   left.G == right.G &&
+                   left.B == right.B;
+        }
+
+        /// <summary>
+        ///     Returns a boolean indicating whether the two given colors are not equal.
+        /// </summary>
+        /// <param name="left">The first color to compare.</param>
+        /// <param name="right">The second color to compare.</param>
+        /// <returns><see langword="true" /> if the color are not equal; <see langword="false" /> if they are equal.</returns>
+        public static bool operator !=(Color left, Color right)
+        {
+            return !(left == right);
+        }
+
+        /// <inheritdoc />
+        public readonly bool Equals(Color other)
+        {
+            return this == other;
+        }
 
-        public Color(byte r, byte g, byte b) : base (r,g,b)
+        /// <inheritdoc />
+        public override readonly bool Equals(object obj)
         {
+            return obj is Color other && Equals(other);
+        }
+
+        /// <inheritdoc />
+        public override readonly int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = R.GetHashCode();
+                hashCode = (hashCode * 397) ^ G.GetHashCode();
+                hashCode = (hashCode * 397) ^ B.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        ///     Returns a <see cref="string" /> representing this <see cref="Color" /> instance.
+        /// </summary>
+        /// <returns>The <see cref="string" /> representation.</returns>
+        public override readonly string ToString()
+        {
+            return ToString("G", CultureInfo.CurrentCulture);
+        }
+
+        /// <summary>
+        ///     Returns a <see cref="string" /> representing this <see cref="Color" /> instance, , using the specified format to
+        ///     format individual elements.
+        /// </summary>
+        /// <param name="format">The format of individual elements.</param>
+        /// <returns>The string representation.</returns>
+        public readonly string ToString(string? format)
+        {
+            return ToString(format, CultureInfo.CurrentCulture);
+        }
+
+        /// <summary>
+        ///     Returns a <see cref="string" /> representing this <see cref="Color" /> instance, , using the specified format to
+        ///     format individual elements.
+        /// </summary>
+        /// <param name="format">The format of individual elements.</param>
+        /// <param name="formatProvider">The format provider to use when formatting elements.</param>
+        /// <returns>The string representation.</returns>
+        public readonly string ToString(string? format, IFormatProvider? formatProvider)
+        {
+            var builder = new StringBuilder();
+            var separator = NumberFormatInfo.GetInstance(formatProvider).NumberGroupSeparator;
+
+            builder.Append('<')
+                   .Append(R.ToString(format, formatProvider))
+                   .Append(separator)
+                   .Append(' ')
+                   .Append(G.ToString(format, formatProvider))
+                   .Append(separator)
+                   .Append(' ')
+                   .Append(B.ToString(format, formatProvider))
+                   .Append('>');
+
+            return builder.ToString();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/VpNet/ManagedApi/System/Interfaces/ApiFunctions/IChatFunctions.cs b/VpNet/ManagedApi/System/Interfaces/ApiFunctions/IChatFunctions.cs
index 7efd1f2..d06a8e4 100644
--- a/VpNet/ManagedApi/System/Interfaces/ApiFunctions/IChatFunctions.cs
+++ b/VpNet/ManagedApi/System/Interfaces/ApiFunctions/IChatFunctions.cs
@@ -8,10 +8,10 @@ public interface IChatFunctions
 
         void ConsoleMessage(IAvatar targetAvatar, string name, string message, TextEffectTypes effects = 0, byte red = 0, byte green = 0, byte blue = 0);
         void ConsoleMessage(int targetSession, string name, string message, TextEffectTypes effects = 0, byte red = 0, byte green = 0, byte blue = 0);
-        void ConsoleMessage(IAvatar targetAvatar, string name, string message, Color color, TextEffectTypes effects = 0);
-        void ConsoleMessage(int targetSession, string name, string message, Color color, TextEffectTypes effects = 0);
-        void ConsoleMessage(string name, string message, Color color, TextEffectTypes effects = 0);
-        void ConsoleMessage(string message, Color color, TextEffectTypes effects = 0);
+        void ConsoleMessage(IAvatar targetAvatar, string name, string message, Color? color, TextEffectTypes effects = 0);
+        void ConsoleMessage(int targetSession, string name, string message, Color? color, TextEffectTypes effects = 0);
+        void ConsoleMessage(string name, string message, Color? color, TextEffectTypes effects = 0);
+        void ConsoleMessage(string message, Color? color, TextEffectTypes effects = 0);
         void ConsoleMessage(string message);
     }
 }