       creator.fetchUser (err, user)->
         if err then handleError err
         else
-          addVm group, user, {
+          addVm {
+            target  : group
+            user    : user
             sudo    : yes
             name    : group.slug
             groups  : wrapGroup group

      member.fetchUser (err, user)->
        if err then handleError err
        else if group.slug is 'koding'
          addVm member, user, sudo: yes, name: member.profile.nickname
        else
          group.fetchVms (err, vms)->
            if err then handleError err

    JGroup  = require './group'
    JUser   = require './user'

    addVm = ({ target, user, name, sudo, groups })->
      vm = new JVM {
        name: name
        users: [
