diff --git a/entity/FactEntities.xml b/entity/FactEntities.xml
index 0ce2e2b..3866e16 100644
--- a/entity/FactEntities.xml
+++ b/entity/FactEntities.xml
@@ -20,8 +20,9 @@ under the License.
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
     <entity entity-name="OrderItemFulfillmentFact" package="co.hotwax.bi.fact" group="analytical">
-        <field name="orderId" type="id" is-pk="true"/>
-        <field name="orderItemSeqId" type="id" is-pk="true"/>
+        <field name="orderItemFulfillmentFactId" type="id" is-pk="true"/>
+        <field name="orderId" type="id" />
+        <field name="orderItemSeqId" type="id" />
         <field name="externalId" type="text-short"/>
         <field name="orderName" type="text-short"/>
         <field name="orderTypeId" type="id"/>
@@ -81,4 +82,4 @@ under the License.
             <key-map field-name="itemCancelledDateDimId" related="dateValue"/>
         </relationship>
     </entity>
-</entities>
\ No newline at end of file
+</entities>
diff --git a/service/co/hotwax/bi/DimensionServices.xml b/service/co/hotwax/bi/DimensionServices.xml
index eecffdd..85543a9 100644
--- a/service/co/hotwax/bi/DimensionServices.xml
+++ b/service/co/hotwax/bi/DimensionServices.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
     <!--    <service verb="load" type="script" noun="DateDimension" location="component://bi/src/loadDateDimension.groovy">-->
-    <service verb="load" noun="DateDayDimension">
+    <service verb="load" noun="DateDayDimension" transaction-timeout="300">
         <in-parameters>
             <parameter name="fromDate" type="Timestamp" format="yyyy-MM-dd" required="true">
                 <description>From date to generate the date dimension</description>
@@ -65,4 +65,4 @@
             <return type="success" message="Date dimension entity loading is completed fromDate: ${fromDate}, thruDate: ${thruDate}" />
         </actions>
     </service>
-</services>
\ No newline at end of file
+</services>