diff --git a/machine.capnp b/machine.capnp
index 74d3abd..938b51b 100644
--- a/machine.capnp
+++ b/machine.capnp
@@ -19,19 +19,9 @@ struct Machine {
         disabled @4;
         reserved @5;
     }
-
-    struct MachineInfo {
-        id @0 :General.UUID;
-        space @1 :Space;
-        name @2 :Text;
-        info @3 :Text;
-
-        state @4 :MachineState;
-
-        user @5 :User;
-        transferuser @6 :User;
-
-        manager @7:User;
+    struct MachineInfoExtended {
+        user @0 :User;
+        transferuser @1 :User;
     }
 
     struct Reservation {
@@ -40,16 +30,23 @@ struct Machine {
         end @2: UInt64;
     }
 
-    info @0 :Info;
+    id @0 :General.UUID;
+    space @1 :Space;
+    name @2 :Text;
+    description @3 :Text;
+    state @4 :MachineState;
+    manager @5:User;
+
+    info @6 :Info;
     interface Info $CSharp.name("InfoInterface") {
-        getMachineInfo @0 () -> ( machineInfo :MachineInfo);
+        getMachineInfoExtended @0 () -> ( machineInfoExtended :MachineInfoExtended);
 
         getPropertyList @1 () -> ( propertyList :List(General.KeyValuePair) );
 
         getReservationList @2 () -> ( reservationList :List(Reservation) );
     }
 
-    use @1 :Use;
+    use @7 :Use;
     interface Use $CSharp.name("UseInterface") {
         use @0 ();
 
@@ -57,7 +54,7 @@ struct Machine {
         reserveto @2 (start :UInt64, end :UInt64);
     }
 
-    inuse @2 :InUse;
+    inuse @8 :InUse;
     interface InUse $CSharp.name("InUseInterface") {
         giveBack @0 ();
 
@@ -66,19 +63,19 @@ struct Machine {
         sendRawData @2 (data :Data);
     }
 
-    transfer @3 :Transfer;
+    transfer @9 :Transfer;
     interface Transfer $CSharp.name("TransferInterface") {
         accept @0 ();
         reject @1 ();
     }
 
-    check @4 :Check;
+    check @10 :Check;
     interface Check $CSharp.name("CheckInterface") {
         check @0 ();
         reject @1 ();
     }
 
-    manage @5 :Manage;
+    manage @11 :Manage;
     interface Manage $CSharp.name("ManageInterface") {
         setProperty @0 (property :General.KeyValuePair);
         removeProperty @1 (property :General.KeyValuePair);
@@ -92,7 +89,7 @@ struct Machine {
         disabled @6 ();
     }
 
-    admin @6 :Admin;
+    admin @12 :Admin;
     interface Admin $CSharp.name("AdminInterface") {
         forceSetState @0 ( state :MachineState );
         forceSetUser @1 ( user :User );
diff --git a/user.capnp b/user.capnp
index a6ed4cf..ff06615 100644
--- a/user.capnp
+++ b/user.capnp
@@ -12,12 +12,9 @@ using Role = import "role.capnp".Role;
 
 struct User
 {
-    struct UserInfo
-    {
-        id @0 :General.UUID;
-        username @1 :Text;
-        space @2 :Space;
-    }
+    id @0 :General.UUID;
+    username @1 :Text;
+    space @2 :Space;
 
     struct UserInfoExtended
     {
@@ -32,29 +29,31 @@ struct User
         }
     }
 
-    info @0 :Info;
+    info @3 :Info;
     interface Info $CSharp.name("InfoInterface") {
-        getUserInfo @0 () -> ( userInfo :UserInfo );
-    }
-
-    manage @1 :Manage;
-    interface Manage $CSharp.name("ManageInterface") {
         getUserInfoExtended @0 () -> ( userInfoExtended :UserInfoExtended );
-        pwd @1 ( pwd :Text ) -> ();
-        
-        addRole @2 ( role :Role ) -> ();
-        removeRole @3 ( role :Role ) -> ();
     }
 
-    cardDESFireEV2 @2 :CardDESFireEV2;
+    manage @4 :Manage;
+    interface Manage $CSharp.name("ManageInterface") {
+        pwd @0 ( pwd :Text ) -> ();
+    }
+
+    admin @5 :Admin;
+    interface Admin $CSharp.name("AdminInterface") {
+        addRole @0 ( role :Role ) -> ();
+        removeRole @1 ( role :Role ) -> ();
+    }
+
+    cardDESFireEV2 @6 :CardDESFireEV2;
     interface CardDESFireEV2 $CSharp.name("CardDESFireInterface") {
         getPIDList @0 () -> ( pids :List(Text) );
         
         getVersion @1 () -> ( version :Text );
-        getDomain @1 () -> ( Domain :Text );
-        getPID @2 () -> ( pid :Text );
+        getDomain @2 () -> ( Domain :Text );
+        getPID @3 () -> ( pid :Text );
         
-        bind @3 ( pid :Text, auth_key :Text ) -> ();
-        revoke @4 ( pid :Text ) -> ();
+        bind @4 ( pid :Text, auth_key :Text ) -> ();
+        revoke @5 ( pid :Text ) -> ();
     }
 }
\ No newline at end of file