3 files changed, 8 insertions, 7 deletions
diff --git a/dev/Kernel/KernelKit/DebugOutput.h b/dev/Kernel/KernelKit/DebugOutput.h
index 498b2b6b..84a2d514 100644
--- a/dev/Kernel/KernelKit/DebugOutput.h
+++ b/dev/Kernel/KernelKit/DebugOutput.h
@@ -38,7 +38,7 @@ namespace NeOS
 	class TerminalDevice final NE_DEVICE<const Char*>
 	{
 	public:
-		TerminalDevice(void (*print)(const Char*), void (*gets)(const Char*))
+		TerminalDevice(void (*print)(IDeviceObject*, const Char*), void (*gets)(IDeviceObject*, const Char*))
 			: IDeviceObject<const Char*>(print, gets)
 		{
 		}
diff --git a/dev/Kernel/KernelKit/DeviceMgr.h b/dev/Kernel/KernelKit/DeviceMgr.h
index 34ca2957..a81a6586 100644
--- a/dev/Kernel/KernelKit/DeviceMgr.h
+++ b/dev/Kernel/KernelKit/DeviceMgr.h
@@ -40,7 +40,7 @@ namespace NeOS
 	class IDeviceObject
 	{
 	public:
-		explicit IDeviceObject(void (*Out)(T), void (*In)(T))
+		explicit IDeviceObject(void (*Out)(IDeviceObject<T>*, T), void (*In)(IDeviceObject<T>*, T))
 			: fOut(Out), fIn(In)
 		{
 		}
@@ -54,19 +54,19 @@ namespace NeOS
 	public:
 		virtual IDeviceObject<T>& operator<<(T Data)
 		{
-			fOut(Data);
+			fOut(this, Data);
 			return *this;
 		}
 
 		virtual IDeviceObject<T>& operator>>(T Data)
 		{
-			fIn(Data);
+			fIn(this, Data);
 			return *this;
 		}
 
 		virtual const char* Name() const
 		{
-			return "IDeviceObject";
+			return "/dev/null";
 		}
 
 		operator bool()
@@ -80,8 +80,8 @@ namespace NeOS
 		}
 
 	protected:
-		Void (*fOut)(T Data) = {nullptr};
-		Void (*fIn)(T Data)	 = {nullptr};
+		Void (*fOut)(IDeviceObject<T>*, T Data) = {nullptr};
+		Void (*fIn)(IDeviceObject<T>*, T Data)	 = {nullptr};
 	};
 
 	///
diff --git a/dev/Kernel/KernelKit/User.h b/dev/Kernel/KernelKit/User.h
index 41cf57e2..76493224 100644
--- a/dev/Kernel/KernelKit/User.h
+++ b/dev/Kernel/KernelKit/User.h
@@ -37,6 +37,7 @@ namespace NeOS
 	};
 
 	typedef Char* UserPublicKey;
+	typedef Char UserPublicKeyType;
 
 	/// @brief User class.
 	class User final