diff --git a/headers/private/app/PortLink.h b/headers/private/app/PortLink.h
index ebf5f3e8b9..e285374334 100644
--- a/headers/private/app/PortLink.h
+++ b/headers/private/app/PortLink.h
@@ -69,6 +69,7 @@ private:
 	char	*fSendBuffer;
 	int32	fSendPosition;
 	int32	fSendCode;
+	int32	*fDataSize;
 };
 
 #endif
diff --git a/headers/private/app/PortMessage.h b/headers/private/app/PortMessage.h
index a82282ca55..81a5c0c8e9 100644
--- a/headers/private/app/PortMessage.h
+++ b/headers/private/app/PortMessage.h
@@ -42,11 +42,13 @@ public:
 	status_t WriteToPort(const port_id &port);	
 	
 	void SetCode(const int32 &code);
+	void SetProtocol(int32 protocol) { _protocol=protocol; }
 	void SetBuffer(const void *buffer, const ssize_t &size, const bool &copy=false);
 
 	int32 Code(void) { return _code; }
 	void *Buffer(void) { return _buffer; }
 	ssize_t BufferSize(void) { return _buffersize; }
+	int32 Protocol(void) const { return _protocol; }
 	
 	status_t Read(void *data, ssize_t size);
 	status_t ReadString(char **string);
@@ -74,6 +76,7 @@ private:
 	uint8 *_buffer;
 	ssize_t _buffersize;
 	uint8 *_index;
+	int32 _protocol;
 };
 
 #endif
diff --git a/headers/private/app/ServerProtocol.h b/headers/private/app/ServerProtocol.h
index 9df14b3023..a218457244 100644
--- a/headers/private/app/ServerProtocol.h
+++ b/headers/private/app/ServerProtocol.h
@@ -14,6 +14,8 @@ SERVER_TRUE='_srt',
 SERVER_FALSE,
 AS_SERVER_BMESSAGE,
 AS_SERVER_AREALINK,
+AS_SERVER_SESSION,
+AS_SERVER_PORTLINK,
 
 // Application definitions
 AS_CREATE_APP,
@@ -29,7 +31,7 @@ AS_DELETE_BITMAP,
 
 // Cursor definitions
 AS_SET_CURSOR_DATA,	
-AS_SET_CURSOR_BCURSOR, // offset 10
+AS_SET_CURSOR_BCURSOR,
 AS_SET_CURSOR_BBITMAP,
 AS_SET_CURSOR_SYSTEM,
 
@@ -41,7 +43,7 @@ AS_GET_SYSCURSOR,
 
 AS_SHOW_CURSOR,
 AS_HIDE_CURSOR,
-AS_OBSCURE_CURSOR, // offset 20
+AS_OBSCURE_CURSOR,
 AS_QUERY_CURSOR_HIDDEN,
 
 AS_CREATE_BCURSOR,
@@ -55,7 +57,7 @@ AS_SHOW_WINDOW,
 AS_HIDE_WINDOW,
 AS_QUIT_WINDOW,
 AS_SEND_BEHIND,
-AS_SET_LOOK, // 30
+AS_SET_LOOK,
 AS_SET_FEEL, 
 AS_SET_FLAGS,
 AS_DISABLE_UPDATES,
@@ -65,7 +67,7 @@ AS_END_UPDATE,
 AS_NEEDS_UPDATE,
 AS_WINDOW_TITLE,
 AS_ADD_TO_SUBSET,
-AS_REM_FROM_SUBSET, // 40
+AS_REM_FROM_SUBSET,
 AS_SET_ALIGNMENT,
 AS_GET_ALIGNMENT,
 AS_GET_WORKSPACES,
@@ -75,7 +77,7 @@ AS_WINDOW_MOVE,
 AS_SET_SIZE_LIMITS,
 AS_ACTIVATE_WINDOW,
 AS_WINDOW_MINIMIZE,
-AS_UPDATE_IF_NEEDED, // 50
+AS_UPDATE_IF_NEEDED,
 _ALL_UPDATED_,	// this should be moved in place of _UPDATE_IF_NEEDED_ in AppDefs.h
 
 
@@ -90,7 +92,7 @@ AS_QUERY_FONTS_CHANGED,
 AS_UPDATED_CLIENT_FONTLIST,
 AS_GET_FAMILY_ID,
 AS_GET_STYLE_ID,
-AS_GET_STYLE_FOR_FACE, // 60
+AS_GET_STYLE_FOR_FACE,
 
 // This will be modified. Currently a kludge for the input server until
 // BScreens are implemented by the IK Taeam
@@ -108,7 +110,7 @@ AS_COUNT_WORKSPACES,
 AS_SET_WORKSPACE_COUNT,
 AS_CURRENT_WORKSPACE,
 AS_ACTIVATE_WORKSPACE,
-AS_SET_SCREEN_MODE, // 70
+AS_SET_SCREEN_MODE,
 AS_GET_SCROLLBAR_INFO,
 AS_SET_SCROLLBAR_INFO,
 AS_IDLE_TIME,
@@ -118,7 +120,7 @@ AS_RUN_BE_ABOUT,
 AS_SET_FOCUS_FOLLOWS_MOUSE,
 AS_FOCUS_FOLLOWS_MOUSE,
 AS_SET_MOUSE_MODE,
-AS_GET_MOUSE_MODE, // 80
+AS_GET_MOUSE_MODE,
 
 // Hook function messages
 AS_WORKSPACE_ACTIVATED,
@@ -134,7 +136,7 @@ AS_SET_HIGH_COLOR,
 AS_SET_LOW_COLOR,
 AS_SET_VIEW_COLOR,
 
-AS_STROKE_ARC, // 90
+AS_STROKE_ARC,
 AS_STROKE_BEZIER,
 AS_STROKE_ELLIPSE,
 AS_STROKE_LINE,
@@ -145,7 +147,7 @@ AS_STROKE_ROUNDRECT,
 AS_STROKE_SHAPE,
 AS_STROKE_TRIANGLE,
 
-AS_FILL_ARC, // 100
+AS_FILL_ARC,
 AS_FILL_BEZIER,
 AS_FILL_ELLIPSE,
 AS_FILL_POLYGON,
@@ -156,7 +158,7 @@ AS_FILL_SHAPE,
 AS_FILL_TRIANGLE,
 
 AS_MOVEPENBY,
-AS_MOVEPENTO, // 110
+AS_MOVEPENTO,
 AS_SETPENSIZE,
 
 AS_DRAW_STRING,
@@ -169,7 +171,7 @@ AS_SYNC,
 AS_LAYER_CREATE,
 AS_LAYER_DELETE,
 AS_LAYER_CREATE_ROOT,
-AS_LAYER_DELETE_ROOT, // 120
+AS_LAYER_DELETE_ROOT,
 AS_LAYER_ADD_CHILD, 
 AS_LAYER_REMOVE_CHILD,
 AS_LAYER_REMOVE_SELF,
@@ -180,7 +182,7 @@ AS_LAYER_RESIZE,
 AS_LAYER_INVALIDATE,
 AS_LAYER_DRAW,
 
-AS_LAYER_GET_TOKEN, // 130
+AS_LAYER_GET_TOKEN,
 AS_LAYER_ADD,
 AS_LAYER_REMOVE,