diff --git a/sbin/create_dm_db.sh b/sbin/create_dm_db.sh
index b1e8b74c76c7d50f4ac38c54a4b1a2c1f5a22131..355d13a1d00f4c8c9d6e2d886a26638608043ca6 100755
--- a/sbin/create_dm_db.sh
+++ b/sbin/create_dm_db.sh
@@ -180,6 +180,8 @@ DM_DB_TABLES="\
   user_info \
   role_type \
   user_system_role \
+  policy_type \
+  allowed_policy_type
 "
 for dbTable in $DM_DB_TABLES; do
     dbFile=populate_$dbTable.sql
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
index 2658debc03df57461fd5f6e815145bbab2ec4747..d7a33d08ac87445f282817f95c0690d9e2b3e5df 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
@@ -3,10 +3,9 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:p="http://primefaces.org/ui"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-    <c:set var="roleTypeObject" value="#{roleTypeController.selected}"/>
+    <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
 
     <p:panelGrid columns="2" styleClass="createEntityDetails">
 
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
index 9bf391922d31f60752868de7da85c6deeeffe7b6..805a2b51152abfe98290e5c6b4a753cf0d77edfe 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
@@ -6,8 +6,7 @@
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
-    <c:set var="roleTypeObject" value="#{roleTypeController.selected}"/>
-    <c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
+    <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
 
     <p:panelGrid columns="2" styleClass="editEntityDetails"> 
 
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml
index 9ded45b9e28c8371d95caca44f8be69fc74a5f97..2e4932aa51aea925c2a0ae09c68a7b09b989cf8d 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeViewPanelGrid.xhtml
@@ -3,10 +3,9 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:p="http://primefaces.org/ui"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-    <c:set var="roleTypeObject" value="#{roleTypeController.selected}"/>
+    <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
 
     <p:panelGrid columns="2" styleClass="viewEntityDetails">
 
diff --git a/src/java/DmWebPortal/web/views/roleType/view.xhtml b/src/java/DmWebPortal/web/views/roleType/view.xhtml
index 3e9942d79ea5ba1d6a81df8abbd307a2dab2b140..2c359f41726fa187d007e92fff5cc2ddf8895b89 100644
--- a/src/java/DmWebPortal/web/views/roleType/view.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/view.xhtml
@@ -21,7 +21,6 @@
                 
                 <p/>
                 <ui:param name="roleTypeObject" value="#{roleTypeController.selected}"/>
-                <ui:param name="isEntityWriteable" value="#{loginController.loggedIn}"/>
                 <div class="actionButton">
                     <p:commandButton action="#{roleTypeController.prepareEdit(roleTypeObject)}" rendered="#{loginController.admin}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
                     <p:commandButton action="#{roleTypeController.prepareList()}" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>