diff --git a/proto/cursor_service.proto b/proto/cursor_service.proto
index b0319a8..a9fa0bc 100644
--- a/proto/cursor_service.proto
+++ b/proto/cursor_service.proto
@@ -1,13 +1,13 @@
 syntax = "proto2";
 
-package codemp.cursor;
+package codemp.cursor_service;
 import "proto/model/cursor.proto";
 import "proto/model/user.proto";
 
 // handle cursor events and broadcast to all users
 service Cursor {
 	// send cursor movement to server
-	rpc Moved  (cursor.CursorEvent)      returns (cursor.MovedResponse);
+	rpc Moved  (codemp.model.cursor.CursorEvent)      returns (codemp.model.cursor.MovedResponse);
 	// attach to a workspace and receive cursor events
-	rpc Listen (codemp.model.user.UserIdentity)     returns (stream cursor.CursorEvent);
+	rpc Listen (codemp.model.user.UserIdentity)     returns (stream codemp.model.cursor.CursorEvent);
 }
diff --git a/proto/workspace_service.proto b/proto/workspace_service.proto
index f06a5fa..9d4a7a1 100644
--- a/proto/workspace_service.proto
+++ b/proto/workspace_service.proto
@@ -25,7 +25,6 @@
 syntax = "proto2";
 
 package codemp.workspace_service;
-import "proto/model/cursor.proto";
 import "proto/model/user.proto";
 
 
@@ -54,14 +53,16 @@ message UserListRequest{}
 service Workspace {
 
 	//
-	rpc Create (BufferPayload)    returns (Empty);
+	rpc Create (BufferPayload) returns (Empty);
 
 	rpc Attach (AttachRequest) returns (Token);
 
-	rpc ListBuffers (BufferListRequest) returns (Empty);
+	rpc ListBuffers (BufferListRequest) returns (BufferTree);
 
 	rpc ListUsers (UserListRequest) returns (UserList);
 
+	rpc ListBufferUsers (Empty) returns (Empty);
+
 	rpc Join (JoinRequest) returns (Token);
 
 }