diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000000000000000000000000000000000000..70bb535b00986c9d4f0af96941b23f04d24814fb_TkVXUw==
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,4 @@
+2.0
+
+* SAML tokens are not stored in res_users anymore to avoid locks on that table.
+
diff --git a/README b/README
new file mode 100644
index 0000000000000000000000000000000000000000..70bb535b00986c9d4f0af96941b23f04d24814fb_UkVBRE1F
--- /dev/null
+++ b/README
@@ -0,0 +1,1 @@
+This is a module for odoo/OpenERP 7. It provides authentification via SAML.
diff --git a/__init__.py b/__init__.py
index 06ccd421baba44872336dab75fb8bc4a9e4f769f_X19pbml0X18ucHk=..70bb535b00986c9d4f0af96941b23f04d24814fb_X19pbml0X18ucHk= 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,3 +1,4 @@
 import controllers
 import auth_saml
 import res_users
+import token
diff --git a/__openerp__.py b/__openerp__.py
index 06ccd421baba44872336dab75fb8bc4a9e4f769f_X19vcGVuZXJwX18ucHk=..70bb535b00986c9d4f0af96941b23f04d24814fb_X19vcGVuZXJwX18ucHk= 100644
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -23,7 +23,7 @@
 
 {
     'name': 'Saml2 Authentication',
-    'version': '1.2.1',
+    'version': '2.0',
     'category': 'Tools',
     'description': """
 Allow users to login through Saml2 Provider.
diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index 06ccd421baba44872336dab75fb8bc4a9e4f769f_c2VjdXJpdHkvaXIubW9kZWwuYWNjZXNzLmNzdg==..70bb535b00986c9d4f0af96941b23f04d24814fb_c2VjdXJpdHkvaXIubW9kZWwuYWNjZXNzLmNzdg== 100644
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_auth_saml_provider,auth_saml_provider,model_auth_saml_provider,base.group_system,1,1,1,1
+access_auth_saml_token,access_auth_saml_token,model_auth_saml_token,,0,0,0,0