       return callback null, workspace
 
   @fetch = secure (client, query = {}, callback) ->
-    query.owner = client.connection.delegate._id
-    JWorkspace.some query, {}, callback
+
+    query.originId = client.connection.delegate._id
+
+    JWorkspace.some query, limit: 30, callback
 
 
   @deleteById = secure (client, id, callback)->
 
-    selector =
-      owner  : client.connection.delegate._id
-      _id    : ObjectId id
+    selector   =
+      originId : client.connection.delegate._id
+      _id      : ObjectId id
 
     JWorkspace.one selector, (err, ws)->
       return callback err  if err?

  @share()

  @set
    schema         :
      name         : String
      slug         : String
      machineUId   : String
      machineLabel : String
      rootPath     : String
      owner        : String
      layout       : Object

    sharedMethods  :


    { delegate } = client.connection

    unless delegate.getId().equals this.originId
      return callback new KodingError 'Access denied'

    @remove callback
