diff --git a/README.md b/README.md
index fe2567cc..1dbff036 100644
--- a/README.md
+++ b/README.md
@@ -106,6 +106,10 @@ Older JAAS/PicketLink configuration can be still used, but you have to place it
 	* password: `perfrepouser1.`
 
 * If you need more users, you have to add them manually into database.
+```
+insert into public.user (id, username, first_name, last_name, email, password) values (nextVal('user_sequence'), 'userName', 'first', 'last', 'email', encode(decode(md5('password'),'hex'),'base64'));
+insert into user_group (user_id, group_id) values ((select id from public.user where username='userName'), (select id from public.group where name='perfrepouser'));
+```
 
 # Running tests
 
diff --git a/model/pom.xml b/model/pom.xml
index df3e39f8..8251680e 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -9,6 +9,16 @@
    <name>Performance Result Repository Model</name>
 
    <dependencies>
+      <dependency>
+         <groupId>javax.annotation</groupId>
+         <artifactId>javax.annotation-api</artifactId>
+         <version>1.3.2</version>
+      </dependency>
+      <dependency>
+         <groupId>javax.xml.bind</groupId>
+         <artifactId>jaxb-api</artifactId>
+         <version>2.3.0</version>
+      </dependency>
       <dependency>
          <groupId>javax.validation</groupId>
          <artifactId>validation-api</artifactId>
diff --git a/model/src/main/sql/db_schema_creation.sql b/model/src/main/sql/db_schema_creation.sql
index 81faa09f..d26656d9 100644
--- a/model/src/main/sql/db_schema_creation.sql
+++ b/model/src/main/sql/db_schema_creation.sql
@@ -374,7 +374,7 @@ ALTER TABLE ONLY test_execution
 --
 
 ALTER TABLE ONLY test_execution_tag
-    ADD CONSTRAINT test_execution_tag_pkey PRIMARY KEY (id);
+    ADD CONSTRAINT test_execution_tag_pkey PRIMARY KEY (tag_id);
 
 
 --
@@ -382,7 +382,7 @@ ALTER TABLE ONLY test_execution_tag
 --
 
 ALTER TABLE ONLY test_metric
-    ADD CONSTRAINT test_metric_pkey PRIMARY KEY (id);
+    ADD CONSTRAINT test_metric_pkey PRIMARY KEY (metric_id);
 
 
 --
@@ -542,8 +542,8 @@ ALTER TABLE ONLY user_property
 --
 
 REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM postgres;
-GRANT ALL ON SCHEMA public TO postgres;
+--REVOKE ALL ON SCHEMA public FROM postgres;
+--GRANT ALL ON SCHEMA public TO postgres;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 -----------------------------------------------------------------------------------------------
diff --git a/web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
new file mode 100644
index 00000000..65ac8f1a
--- /dev/null
+++ b/web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,7 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
+    <deployment>
+        <dependencies>
+            <module name="jdk.xml.dom"/>
+        </dependencies>
+    </deployment>
+</jboss-deployment-structure>
\ No newline at end of file