diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/InfraActiveRequests.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/InfraActiveRequests.hbm.xml
index ee12b45..8ee3ddd 100644
--- a/mso-api-handlers/mso-requests-db/src/main/resources/InfraActiveRequests.hbm.xml
+++ b/mso-api-handlers/mso-requests-db/src/main/resources/InfraActiveRequests.hbm.xml
@@ -20,7 +20,7 @@
   -->
 
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <!-- Generated Jul 27, 2015 3:05:00 PM by Hibernate Tools 3.4.0.CR1 -->
 <hibernate-mapping>
     <class name="org.openecomp.mso.requestsdb.InfraActiveRequests" table="INFRA_ACTIVE_REQUESTS">
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/OperationStatus.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/OperationStatus.hbm.xml
index 60fc359..f00c2da 100644
--- a/mso-api-handlers/mso-requests-db/src/main/resources/OperationStatus.hbm.xml
+++ b/mso-api-handlers/mso-requests-db/src/main/resources/OperationStatus.hbm.xml
@@ -36,7 +36,9 @@
 		<property name="operationContent" column="OPERATION_CONTENT" type="string" length="256"/>
 		<property name="progress" column="PROGRESS" type="string" length="256"/>
 		<property name="reason" column="REASON" type="string" length="256"/>
-		<property name="operateAt" column="OPERATE_AT" type="timestamp" generated="insert" insert="false" update="false"/>
+		<property name="operateAt" type="timestamp" generated="insert" insert="false" update="false" not-null="true">
+          <column name="OPERATE_AT" default="CURRENT_TIMESTAMP"/>
+        </property>
 		<property name="finishedAt" column="FINISHED_AT" type="timestamp" generated="update" insert="false" update="false"/>	
 	</class>
 </hibernate-mapping>
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/SiteStatus.hbm.xml b/mso-api-handlers/mso-requests-db/src/main/resources/SiteStatus.hbm.xml
index 95ccfda..f755ad0 100644
--- a/mso-api-handlers/mso-requests-db/src/main/resources/SiteStatus.hbm.xml
+++ b/mso-api-handlers/mso-requests-db/src/main/resources/SiteStatus.hbm.xml
@@ -30,6 +30,8 @@
 		<id name="siteName" type="string" column="SITE_NAME"/>
 
 		<property name="status" column="STATUS" type="boolean" length="256"/>
-		<property name="created" column="CREATION_TIMESTAMP" type="timestamp" generated="insert" insert="false" update="false"/>
+		<property name="created" type="timestamp" generated="insert" insert="false" update="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 	</class>
 </hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/AllottedResource.hbm.xml b/mso-catalog-db/src/main/resources/AllottedResource.hbm.xml
index 15fe12f..0c61b5f 100644
--- a/mso-catalog-db/src/main/resources/AllottedResource.hbm.xml
+++ b/mso-catalog-db/src/main/resources/AllottedResource.hbm.xml
@@ -19,7 +19,7 @@
   ============LICENSE_END=========================================================
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <!-- Generated Mar 29, 2017 4:25:31 PM by Hibernate Tools 3.4.0.CR1 -->
 <hibernate-mapping>
     <class name="org.openecomp.mso.db.catalog.beans.AllottedResource" table="ALLOTTED_RESOURCE">
@@ -45,8 +45,8 @@
         <property name="description" type="java.lang.String" length="1200">
             <column name="DESCRIPTION" />
         </property>
-        <property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-		    <column name="CREATION_TIMESTAMP" not-null="true"/>
-		</property>
+        <property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
     </class>
 </hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
index 7720a93..0cf5016 100644
--- a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
+++ b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
@@ -19,7 +19,7 @@
   ============LICENSE_END=========================================================
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <!-- Generated Dec 14, 2016 10:57:53 AM by Hibernate Tools 3.4.0.CR1 -->
 <hibernate-mapping>
     <class name="org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization"
@@ -58,8 +58,8 @@
         <property name="maxInstances" type="java.lang.Integer">
             <column name="MAX_INSTANCES" />
         </property>
-        <property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-		    <column name="CREATION_TIMESTAMP" not-null="true"/>
-		</property>
+        <property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
     </class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml b/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
index 711b73a..b2c94e8 100644
--- a/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
+++ b/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
@@ -20,7 +20,7 @@
   -->
 
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <!-- Generated Aug 6, 2015 1:11:38 PM by Hibernate Tools 3.4.0.CR1 -->
 <hibernate-mapping>
     <class name="org.openecomp.mso.db.catalog.beans.HeatEnvironment" table="HEAT_ENVIRONMENT">
@@ -40,9 +40,9 @@
 		<property name="environment" type="text">
 		      <column name="BODY" not-null="true"/>
 		</property>
-		<property name="created" type="timestamp" generated="insert" insert="false" update="false">
-		    <column name="CREATION_TIMESTAMP" not-null="true"/>
-		</property>
+		<property name="created" type="timestamp" generated="insert" insert="false" update="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 		<property name="artifactChecksum" type="string">
 		  <column name="ARTIFACT_CHECKSUM" length="200" default="'MANUAL RECORD'" not-null="false"/>
 		</property>
diff --git a/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml b/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml
index 252649c..4674239 100644
--- a/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml
+++ b/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml
@@ -19,7 +19,7 @@
   ============LICENSE_END=========================================================
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <!-- Generated Mar 31, 2017 3:39:01 PM by Hibernate Tools 3.4.0.CR1 -->
 <hibernate-mapping>
     <class name="org.openecomp.mso.db.catalog.beans.HeatFiles" table="HEAT_FILES">
@@ -39,8 +39,8 @@
         <property name="fileBody" type="java.lang.String" not-null="true">
             <column name="BODY" />
         </property>
-        <property name="created" type="java.sql.Timestamp" generated="insert" update="false" insert="false">
-            <column name="CREATION_TIMESTAMP" not-null="true"/>
+        <property name="created" type="java.sql.Timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
         </property>
         <property name="artifactChecksum" type="java.lang.String" length="200" not-null="true">
             <column name="ARTIFACT_CHECKSUM"/>
diff --git a/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml b/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml
index b89a93c..a2c590f 100644
--- a/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml
+++ b/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml
@@ -19,7 +19,7 @@
   ============LICENSE_END=========================================================
   -->
 
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
 <hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
 	<class name="HeatNestedTemplate" table="HEAT_NESTED_TEMPLATE">
 		<meta attribute="class-description">
diff --git a/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml b/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
index c1866e9..2fb64aa 100644
--- a/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
+++ b/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
@@ -43,9 +43,9 @@
 		</property>
 		<property name="timeoutMinutes" column="TIMEOUT_MINUTES" type="int"/>
 		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-		  <column name="CREATION_TIMESTAMP" not-null="true"/>
-		</property>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 		<property name="artifactChecksum" type="string">
 		  <column name="ARTIFACT_CHECKSUM" length="200" default="'MANUAL RECORD'" not-null="true"/>
 		</property>
diff --git a/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
index e59bb5c..2332324 100644
--- a/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
@@ -45,9 +45,9 @@
 		<property name="modelVersion" column="MODEL_VERSION" type="string" length="20"/>
 		<property name="modelCustomizationId" column="MODEL_CUSTOMIZATION_ID" type="string" length="40"/>
 		<property name="modelCustomizationName" column="MODEL_CUSTOMIZATION_NAME" type="string" length="40"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-		    <column name="CREATION_TIMESTAMP" not-null="true"/>
-		</property>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 
 		<map name="recipes" cascade="all">
 			<key column="MODEL_ID"/>
@@ -80,8 +80,8 @@
         </property>
 		<property name="modelParamXSD" column="MODEL_PARAM_XSD" type="string" length="2048"/>
 		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-		    <column name="CREATION_TIMESTAMP" not-null="true"/>
-		</property>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
index 25c5ccd..1ed9c7c 100644
--- a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
@@ -53,9 +53,9 @@
 		</property>
 		<property name="networkParamXSD" column="NETWORK_PARAM_XSD" type="string" length="2048"/>
 		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-		    <column name="CREATION_TIMESTAMP" not-null="true"/>
-		</property>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 	</class>
 	
 </hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
index b8c2f39..7f4698e 100644
--- a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
+++ b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
@@ -44,7 +44,9 @@
 			<column name="AIC_VERSION_MAX" not-null="false" default="2.5" length="20"/>
 		</property>
 		
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 
 	</class>
 
diff --git a/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
index 37bb77f..236da54 100644
--- a/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
+++ b/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
@@ -18,7 +18,7 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
     <class name="org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization" table="NETWORK_RESOURCE_CUSTOMIZATION"> 
@@ -39,8 +39,8 @@
         <property name="networkRole" type="java.lang.String" length="200">
             <column name="NETWORK_ROLE" />
         </property>
-        <property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-            <column name="CREATION_TIMESTAMP" not-null="true"/>
+        <property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
         </property>
     </class>
 </hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/Service.hbm.xml b/mso-catalog-db/src/main/resources/Service.hbm.xml
index b48c55d..5bdb0f6 100644
--- a/mso-catalog-db/src/main/resources/Service.hbm.xml
+++ b/mso-catalog-db/src/main/resources/Service.hbm.xml
@@ -33,7 +33,9 @@
 		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
 		<property name="toscaCsarArtifactUUID" 	column="TOSCA_CSAR_ARTIFACT_UUID" 	type="string" 		length="200" />
 
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 		<property name="modelInvariantUUID" type="string">
            <column name="MODEL_INVARIANT_UUID" default="'MANUAL_RECORD'" not-null="true" length="200"/>
         </property>
diff --git a/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml
index 0003c37..75be1c7 100644
--- a/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml
@@ -40,7 +40,9 @@
 		</properties>
 		
 		<property name="orchestrationUri" type="string" column="ORCHESTRATION_URI" not-null="true" length="256"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 
 		<property name="action" 				column="ACTION" 					type="string" 			length="20" insert="false" update="false" />
 		<property name="version" 				column="VERSION_STR" 				type="string" 			length="20"/>
diff --git a/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml b/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml
index 1d471ca..dca2188 100644
--- a/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml
+++ b/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml
@@ -18,7 +18,7 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
 <hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
 	<class name="ServiceToAllottedResources" table="SERVICE_TO_ALLOTTED_RESOURCES">
 		<meta attribute="class-description">
@@ -33,9 +33,9 @@
 				<column name="AR_MODEL_CUSTOMIZATION_UUID" length="200" not-null="true"/>
 			</key-property>
 		</composite-id>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-		    <column name="CREATION_TIMESTAMP" not-null="true"/>
-		</property>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 	</class>
 
 </hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml b/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml
index 1c96f7b..5e2caa9 100644
--- a/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml
+++ b/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml
@@ -18,7 +18,7 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
 <hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
 	<class name="ServiceToNetworks" table="SERVICE_TO_NETWORKS">
 		<meta attribute="class-description">
@@ -33,9 +33,9 @@
 				<column name="NETWORK_MODEL_CUSTOMIZATION_UUID" not-null="true" length="200"/>
 			</key-property>
 		</composite-id>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-		    <column name="CREATION_TIMESTAMP" not-null="true"/>
-		</property>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 	</class>
 
 </hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/ServiceToResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/ServiceToResourceCustomization.hbm.xml
index dde156c..d806b48 100644
--- a/mso-catalog-db/src/main/resources/ServiceToResourceCustomization.hbm.xml
+++ b/mso-catalog-db/src/main/resources/ServiceToResourceCustomization.hbm.xml
@@ -30,7 +30,9 @@
 			<key-property name="modelType"  					type="string" column="MODEL_TYPE" length="20" />
 			<key-property name="resourceModelCustomizationUUID" type="string" column="RESOURCE_MODEL_CUSTOMIZATION_UUID" length="200" />
 		</composite-id>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 		<property name="serviceModelUUID" 				type="string" column="SERVICE_MODEL_UUID" length="200" not-null="true"/>
 
 	</class>
diff --git a/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml b/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml
index d5d2108..3a00c89 100644
--- a/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml
+++ b/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml
@@ -18,7 +18,7 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
 <hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
 	<class name="TempNetworkHeatTemplateLookup" table="TEMP_NETWORK_HEAT_TEMPLATE_LOOKUP">
 		<meta attribute="class-description">
diff --git a/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml b/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml
index 9ffb782..3529620 100644
--- a/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml
+++ b/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml
@@ -33,7 +33,9 @@
 		<property name="url" 					column="URL" 					type="string" 			length="200" 	not-null="true"/>
 		<property name="description" 			column="DESCRIPTION" 			type="string" 			length="1200"/>
 		
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+		  <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+		</property>
 	
 		<set name="services" inverse="true" cascade="all">
             <key column="TOSCA_CSAR_ARTIFACT_UUID" not-null="true" />
diff --git a/mso-catalog-db/src/main/resources/VfModule.hbm.xml b/mso-catalog-db/src/main/resources/VfModule.hbm.xml
index 16f3d39..a08e4d1 100644
--- a/mso-catalog-db/src/main/resources/VfModule.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VfModule.hbm.xml
@@ -20,7 +20,7 @@
   -->
 
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <!-- Generated Apr 28, 2016 2:44:06 PM by Hibernate Tools 3.4.0.CR1 -->
 <hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
     <class name="VfModule" table="VF_MODULE">
@@ -36,7 +36,9 @@
         <property name="heatTemplateArtifactUUId" 		type="string" 			column="HEAT_TEMPLATE_ARTIFACT_UUID" 		length="200"	not-null="true" />
         <property name="volHeatTemplateArtifactUUId"	type="string" 			column="VOL_HEAT_TEMPLATE_ARTIFACT_UUID" 	length="200" />
        	
-       	<property name="created" type="timestamp" generated="insert" update="false" insert="false" column ="CREATION_TIMESTAMP" not-null="true"/>
+       	<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 
     </class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/VfModuleCustomization.hbm.xml b/mso-catalog-db/src/main/resources/VfModuleCustomization.hbm.xml
index 2bf5be2..eb91850 100644
--- a/mso-catalog-db/src/main/resources/VfModuleCustomization.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VfModuleCustomization.hbm.xml
@@ -19,7 +19,7 @@
   ============LICENSE_END=========================================================
   -->
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
     <class name="VfModuleCustomization" table="VF_MODULE_CUSTOMIZATION">
     
@@ -32,9 +32,9 @@
             <column name="VOL_ENVIRONMENT_ARTIFACT_UUID" length="200" not-null="false" />
         </property>
 
-       	<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-       	      <column name="CREATION_TIMESTAMP" not-null="true"/>
-       	</property>
+       	<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
         
         <property name="heatEnvironmentArtifactUuid" type="java.lang.String">
             <column name="HEAT_ENVIRONMENT_ARTIFACT_UUID" length="200" not-null="false" />
diff --git a/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml b/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml
index b8498be..d2c523e 100644
--- a/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml
@@ -19,7 +19,7 @@
   ============LICENSE_END=========================================================
   -->
 
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
 <hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
 	<class name="VfModuleToHeatFiles" table="VF_MODULE_TO_HEAT_FILES">
 		<meta attribute="class-description">
diff --git a/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml b/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml
index 3cda770..c629f00 100644
--- a/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml
@@ -34,8 +34,8 @@
             
         <property name="heatTemplateId" column="HEAT_TEMPLATE_ID" type="int" />
         <property name="heatEnvironmentId" column="HEAT_ENVIRONMENT_ID" type="int" />
-        <property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-           <column name="CREATION_TIMESTAMP" not-null="true"/>
+        <property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
         </property>
 
     </class>
diff --git a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
index 69a3a45..20b9cab 100644
--- a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
@@ -48,6 +48,8 @@
         </property>
 		<property name="vnfComponentParamXSD" column="VNF_COMPONENT_PARAM_XSD" type="string" length="2048"/>
 		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
-		<property name="created" column="CREATION_TIMESTAMP" type="timestamp" generated="insert" update="false" insert="false" />
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 	</class>
 </hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
index 4c471ed..4dc7f96 100644
--- a/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
@@ -61,6 +61,8 @@
 
 		<property name="vnfParamXSD" column="VNF_PARAM_XSD" type="string" length="2048"/>
 		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
-		<property name="created" column="CREATION_TIMESTAMP" type="timestamp" generated="insert" update="false" insert="false" />
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 	</class>
 </hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml b/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml
index 77d1dfe..f07af81 100644
--- a/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml
@@ -18,7 +18,7 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
 <hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
 	<class name="VnfResCustomToVfModuleCustom" table="VNF_RES_CUSTOM_TO_VF_MODULE_CUSTOM">
 		<meta attribute="class-description">
@@ -30,9 +30,9 @@
 			<key-property name="vfModuleCustModelCustomizationUuid" column="VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID" type="java.lang.String" length="200"/>
 		</composite-id> 
 		
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-       	      <column name="CREATION_TIMESTAMP" not-null="true"/>
-       	</property>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 				
 	</class>
 	
diff --git a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
index 85b9e2a..2647a0f 100644
--- a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
@@ -37,7 +37,9 @@
 		<property name="aicVersionMin" 				type="string" 		column="AIC_VERSION_MIN" 				length="20"/>
 		<property name="aicVersionMax" 				type="string" 		column="AIC_VERSION_MAX" 				length="20"/>
 		<property name="heatTemplateArtifactUUId" 	type="string" 		column="HEAT_TEMPLATE_ARTIFACT_UUID" 	length="200" />
-		<property name="created" 					type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/>
+		<property name="created" 					type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 		
 		<set name="vnfResourceCustomizations" inverse="true" access="field" cascade="all">
             <key column="VNF_RESOURCE_MODEL_UUID" not-null="true" />
diff --git a/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
index e22b67c..f0af7cb 100644
--- a/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
@@ -38,7 +38,9 @@
 		<property name="nfNamingCode" 				column="NF_NAMING_CODE" 				type="string"		length="200"/>
 		<property name="vnfResourceModelUuid" 		column="VNF_RESOURCE_MODEL_UUID" 		type="string" 		length="200"	not-null="true"  />
 		
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/>
+		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
+          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
+        </property>
 		
 <!--
 		<set name="vfModuleCustomizations" inverse="true" cascade="all">