diff --git a/ECOMP-PAP-REST/xacml.pap.properties b/ECOMP-PAP-REST/xacml.pap.properties
index 91e393d..7ec9447 100644
--- a/ECOMP-PAP-REST/xacml.pap.properties
+++ b/ECOMP-PAP-REST/xacml.pap.properties
@@ -17,12 +17,23 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 ###
-
+#=====================================================================================#
+#================The Below Properties are default, shouldn't change them==============#
+#=====================================================================================#
 #
 # This is our factory that will create our engine
 #
 xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory
-
+# Dictionary and Policy Implementation Classes Properties
+dictionary.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DictionaryHandlerImpl
+savePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.SavePolicyHandler
+pushPolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.PushPolicyHander
+deletePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DeleteHandler
+#AutoPush Policy 
+xacml.rest.pap.autopush.file=autopush.properties
+#=====================================================================================#
+#===============The Below Properties will be changed based on Environment=============#
+#=====================================================================================#
 #
 # Where we store our PAP PDP Group/Node information
 #
@@ -35,7 +46,6 @@
 # but for startup there is no other way to get it.)
 #
 #
-
 xacml.rest.pap.url=http://localhost:8070/pap/
 
 #
@@ -55,28 +65,14 @@
 #
 xacml.rest.pap.heartbeat.timeout=100000
 
-################################################################################################
-# Adding properties for getting properties previously used by PAP-ADMIN for creating Policies
-# THis is part of the Policy Creation API project
-################################################################################################
-
-# Set your domain here:
-xacml.rest.pap.domain=com
-
-# Location where all the user workspaces are located.
-xacml.rest.pap.workspace=workspace
-
-# Location where the GIT repository is located
-xacml.rest.pap.repository=repository
-
 # new Property Please mention your PAP-REST webapps Location here. 
-xacml.rest.config.webapps=C:\\Second Tomcat\\apache-tomcat-8.0.23\\webapps\\ConfigPAP\\
+xacml.rest.config.webapps=/home/users/PolicyEngine/webapps/ConfigPAP/
 
 #Turn the audit on to synchronize the DB/file system
 #xacml.rest.pap.run.audit.flag=true
 #Turn the audit off to not synchronize the DB/file system
 #xacml.rest.pap.run.audit.flag=false
-xacml.rest.pap.run.audit.flag=false
+xacml.rest.pap.run.audit.flag=true
 
 #Audit will synchronize the file system to match the contents of the DB
 #xacml.rest.pap.filesystem.audit=true
@@ -91,12 +87,12 @@
 # pdps file
 xacml.rest.pdp.idfile=test.properties
 
-
+#Properties for db access
 #properties for MySql xacml database:  PLEASE DO NOT REMOVE... NEEDED FOR APIs
 javax.persistence.jdbc.driver=com.mysql.jdbc.Driver
-javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/ecomp_sdk
-javax.persistence.jdbc.user=root
-javax.persistence.jdbc.password=
+javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/ecomp_sdk?failOverReadOnly=false&autoReconnect=true
+javax.persistence.jdbc.user=policy_user
+javax.persistence.jdbc.password=policy_user
 
 #Time in ms which a Policy DB transaction will wait to get the transaction lock object
 xacml.rest.pap.transaction.waitms=500000
@@ -110,10 +106,11 @@
 #controls how long the pap will wait before giving up when sending notifications to other paps
 xacml.rest.pap.notify.timeoutms=10000
 
+#the number of times an incoming policy update notification will be tried to be processed (or until it succeeds)
+xacml.rest.pap.incomingnotification.tries=4
+
 #AutoPush Policy Flag
 xacml.rest.pap.autopush.flag=false
-#AutoPush Policy 
-xacml.rest.pap.autopush.file=autopush.properties
 
 #***Properties for IntegrityMonitor integration defined in XACMLRestProperties.java***
 
@@ -153,3 +150,16 @@
 integrity_audit_period_seconds=-1
 
 ENVIRONMENT=DEVL
+
+#
+#PolicySafetyChecker properties
+#
+#Turn safetyChecker on/off
+xacml.rest.pap.safetychecker=on
+PDP_URL1 = http://localhost:8082/pdp/, testpdp, alpha456
+CLIENT_ID=
+CLIENT_KEY=
+
+#Micro Service Model Properties
+xacml.policy.msEcompName=http://ecomp.com
+xacml.policy.msPolicyName=http://ecomp.com/policy
\ No newline at end of file