diff --git a/card.capnp b/card.capnp
deleted file mode 100644
index cf46ddb..0000000
--- a/card.capnp
+++ /dev/null
@@ -1,21 +0,0 @@
-@0x849f99d8777df6e8;
-
-using Rust = import "programming_language/rust.capnp";
-$Rust.parentModule("schema");
-
-using CSharp = import "programming_language/csharp.capnp";
-$CSharp.namespace("FabAccessAPI.Schema");
-
-struct Card {
-    enum CardType {
-        NXPMifareDESFire_ev2 @0;
-    }
-
-    id @0 :General.UUID;
-    type @1 :CardType;
-
-    manage @2 :Manage;
-    interface Manage $CSharp.name("ManageInterface") {
-        
-    }    
-}
\ No newline at end of file
diff --git a/machine.capnp b/machine.capnp
index 1b1c1fd..74d3abd 100644
--- a/machine.capnp
+++ b/machine.capnp
@@ -44,9 +44,9 @@ struct Machine {
     interface Info $CSharp.name("InfoInterface") {
         getMachineInfo @0 () -> ( machineInfo :MachineInfo);
 
-        getPropertyList @1 () -> (propertyList :List(General.KeyValuePair));
+        getPropertyList @1 () -> ( propertyList :List(General.KeyValuePair) );
 
-        getReservationList @2 () -> (reservationList :List(Reservation));
+        getReservationList @2 () -> ( reservationList :List(Reservation) );
     }
 
     use @1 :Use;
diff --git a/permissionsystem.capnp b/permissionsystem.capnp
index 97ea7a6..592d6f6 100644
--- a/permissionsystem.capnp
+++ b/permissionsystem.capnp
@@ -8,5 +8,13 @@ $CSharp.namespace("FabAccessAPI.Schema");
 
 interface PermissionSystem 
 {
-    
+    info @0 :Info;
+    interface Info $CSharp.name("InfoInterface") {
+    	
+	}
+
+	manage @1 :Manage;
+    interface Manage $CSharp.name("ManageInterface") {
+    	getRoleList @0 () -> ( role_list :List(Text) );
+	}
 }
\ No newline at end of file
diff --git a/cardsystem.capnp b/role.capnp
similarity index 57%
rename from cardsystem.capnp
rename to role.capnp
index f701f50..6dd0aab 100644
--- a/cardsystem.capnp
+++ b/role.capnp
@@ -1,4 +1,4 @@
-@0x8c0fcfd5c37fedc5;
+@0xbacaff4190ac7d80;
 
 using Rust = import "programming_language/rust.capnp";
 $Rust.parentModule("schema");
@@ -6,6 +6,11 @@ $Rust.parentModule("schema");
 using CSharp = import "programming_language/csharp.capnp";
 $CSharp.namespace("FabAccessAPI.Schema");
 
-interface CardSystem {
+using General = import "general.capnp";
 
-}
+struct Space 
+{
+    id @0 :General.UUID;
+    name @1 :Text;
+    info @2 :Text;
+}
\ No newline at end of file
diff --git a/user.capnp b/user.capnp
index fed3d25..6fa0ce5 100644
--- a/user.capnp
+++ b/user.capnp
@@ -39,5 +39,15 @@ struct User
     manage @1 :Manage;
     interface Manage $CSharp.name("ManageInterface") {
         getUserInfoExtended @0 () -> ( userInfoExtended :UserInfoExtended );
+        pwd @1 ( pwd :Text ) -> ();
+        addRole @2 ( )
+    }
+
+    card_DESFire @2 :Card_DESFire;
+    interface Card_DESFire $CSharp.name("CardDESFireInterface") {
+        getPIDList @0 () -> ( pids :List(Text) );
+        getNewURL @1 () -> ( url :Text );
+        bind @2 ( pid :Text, auth_key :Text ) -> ();
+        revoke @3 ( pid :Text ) -> ();
     }
 }
\ No newline at end of file
diff --git a/usersystem.capnp b/usersystem.capnp
index dc90c1d..1a092ce 100644
--- a/usersystem.capnp
+++ b/usersystem.capnp
@@ -13,17 +13,15 @@ interface UserSystem
 {
     info @0 :Info;
     interface Info $CSharp.name("InfoInterface") {
-    	getUserSelf @1 ( ) -> ( user :User);
+    	getUserSelf @1 ( ) -> ( user :User );
 	}
 
 	manage @1 :Manage;
     interface Manage $CSharp.name("ManageInterface") {
-    	getUserList @0 () -> ( user :List(User) );
+    	getUserList @0 () -> ( user_list :List(User) );
 
-    	getMachine @1 ( uuid :General.UUID ) -> ( user :User);
-
-    	addUser @2 (user :User);
-    	updateUser @3 (user :User);
-    	removeUser @4 (user :User);
+    	addUser @1 (username :Text, password: Text) -> ( user :User );
+    	removeUser @2 (user :User );
+    	#updateUser @3 (user :User );
 	}
 }
\ No newline at end of file