diff --git a/jams-common/src/main/java/net/jami/jams/common/authmodule/AuthScope.java b/jams-common/src/main/java/net/jami/jams/common/authmodule/AuthScope.java
new file mode 100644
index 0000000000000000000000000000000000000000..860b6490ba3056edc1c89e8c6696a01e6d6ebb0f
--- /dev/null
+++ b/jams-common/src/main/java/net/jami/jams/common/authmodule/AuthScope.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2020 by Savoir-faire Linux
+ * Authors: William Enright <william.enright@savoirfairelinux.com>
+ *          Ndeye Anna Ndiaye <anna.ndiaye@savoirfairelinux.com>
+ *          Johnny Flores <johnny.flores@savoirfairelinux.com>
+ *          Mohammed Raza <mohammed.raza@savoirfairelinux.com>
+ *          Felix Sidokhine <felix.sidokhine@savoirfairelinux.com>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package net.jami.jams.common.authmodule;
+
+/**
+ * The auth-scope does not have a direct relationship to an access level,
+ * which in itself defines more of a JAMS role, the scope is a combination
+ * of "access levels"
+ */
+public enum AuthScope {
+    DEVICE,
+    USER,
+    ADMIN
+}
diff --git a/jams-common/src/main/java/net/jami/jams/common/authmodule/TokenHolder.java b/jams-common/src/main/java/net/jami/jams/common/authmodule/TokenHolder.java
deleted file mode 100644
index 9d0076af0f82b2360e506f45d34b4ee913176287..0000000000000000000000000000000000000000
--- a/jams-common/src/main/java/net/jami/jams/common/authmodule/TokenHolder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-* Copyright (C) 2020 by Savoir-faire Linux
-* Authors: William Enright <william.enright@savoirfairelinux.com>
-*          Ndeye Anna Ndiaye <anna.ndiaye@savoirfairelinux.com>
-*          Johnny Flores <johnny.flores@savoirfairelinux.com>
-*          Mohammed Raza <mohammed.raza@savoirfairelinux.com>
-*          Felix Sidokhine <felix.sidokhine@savoirfairelinux.com>
-*
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-package net.jami.jams.common.authmodule;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class TokenHolder {
-
-    private String token;
-    private Long   expires;
-
-
-}