--- a/model/container-example.txt	Thu Aug 25 09:55:06 2011 +0100
+++ b/model/container-example.txt	Thu Aug 25 09:57:29 2011 +0100
@@ -1,28 +1,30 @@
 
-provenanceContainer(id,                                     ;;; <- container identifier (global scope?)
+provenanceContainer(id1,                                     ;;; <- container identifier (global scope?)
 
   
  
-  hasProvenance: {
-    bob(id, [ type:"ProvenanceContainer" ])                 ;;; <- container seen as a bob
-    isGeneratedBy(id,p,out)     
-    processExecution(p,assert,"07-28-2011:10.38am")         ;;; <- time of assertion
+  hasProvenance: 
+    provenanceContainer(id2,
+    statements: {
+      entity(id1, [ type:"ProvenanceContainer" ])                 ;;; <- container seen as a entity
+      isGeneratedBy(id,p,out)     
+      processExecution(p,assert,"07-28-2011:10.38am")         ;;; <- time of assertion
 
-    bob(ag_luc, [ type: "Person", name: "Luc" ])            ;;; <- luc is an agent
-    agent(ag_luc)
-    isControlledBy(p,ag_luc,"asserter")                     ;;; <- luc is the asserter
+      entity(ag_luc, [ type: "Person", name: "Luc" ])            ;;; <- luc is an agent
+      agent(ag_luc)
+      isControlledBy(p,ag_luc,"asserter")                     ;;; <- luc is the asserter
   }
 
   
   statements: {
 
-    bob(e0, [ type: "File", location: "/shared/crime.txt", creator: "Alice" ])
-    bob(e1, [ type: "File", location: "/shared/crime.txt", creator: "Alice", content: "" ])
-    bob(e2, [ type: "File", location: "/shared/crime.txt", creator: "Alice", content: "There was a lot of crime in London last month."])
-    bob(e3, [ type: "File", location: "/shared/crime.txt", creator: "Alice", content: "There was a lot of crime in London and New York last month."])
-    bob(e4)
-    bob(e5)
-    bob(e6, [ type: "File", location: "/shared/crime.txt", creator: "Alice", content: "There was a lot of crime in London and New York last month.", disclaimer: "some text" ])
+    entity(e0, [ type: "File", location: "/shared/crime.txt", creator: "Alice" ])
+    entity(e1, [ type: "File", location: "/shared/crime.txt", creator: "Alice", content: "" ])
+    entity(e2, [ type: "File", location: "/shared/crime.txt", creator: "Alice", content: "There was a lot of crime in London last month."])
+    entity(e3, [ type: "File", location: "/shared/crime.txt", creator: "Alice", content: "There was a lot of crime in London and New York last month."])
+    entity(e4)
+    entity(e5)
+    entity(e6, [ type: "File", location: "/shared/crime.txt", creator: "Alice", content: "There was a lot of crime in London and New York last month.", disclaimer: "some text" ])
 
 
     isDerivedFrom(e2,e1)
@@ -30,44 +32,53 @@
     isDerivedFrom(e4,e2)
     isDerivedFrom(e5,e3)
 
-    isGeneratedBy(e0,pe0,out)     
-    isGeneratedBy(e1,pe0,out)     
+    processExecution(pe0,create-file,t)
+    processExecution(pe1,add-crime-in-london,t+1)
+    processExecution(pe2,email,t+2)
+    processExecution(pe3,edit-London-New-York,t+3)
+    processExecution(pe4,email,t+4)
+    processExecution(pe5,spellcheck)
+
+
+    isGeneratedBy(e0,pe0,outFile)     
+    isGeneratedBy(e1,pe0,outContent)     
     isGeneratedBy(e2,pe1,out)     
     isGeneratedBy(e3,pe3,out)     
-    isGeneratedBy(e4,pe2,out)     
-    isGeneratedBy(e5,pe4,out)     
+    isGeneratedBy(e4,pe2,attachment)     
+    isGeneratedBy(e5,pe4,attachment)     
+    isGeneratedBy(e6,pe5,out)     
 
     uses(pe1,e1,in)
     uses(pe3,e2,in)
     uses(pe2,e2,in)
     uses(pe4,e3,in)
-
-    processExecution(pe0,create-file,t)
-    processExecution(pe1,add-crime-in-london,t+1)
-    processExecution(pe2,copy,t+2)
-    processExecution(pe3,edit-London-New-York,t+3)
-    processExecution(pe4,copy,t+4)
-
-    ivpOf(e1,e0)
-    ivpOf(e2,e0)
-    ivpOf(e3,e0)
-    ivpOf(e6,e3) 
+    uses(pe5,e3,fileIn)
 
-    bob(ag_al, [ type: "Person", name: "Alice" ])
-    agent(ag_al)
-    bob(ag_bo, [ type: "Person", name: "Bob" ])
-    agent(ag_bo)
-    bob(ag_ch, [ type: "Person", name: "Charles" ])
-    agent(ag_ch)
-    bob(ag_da, [ type: "Person", name: "David" ])
-    agent(ag_da)
-    bob(ag_ed, [ type: "Person", name: "Edith" ])
-    agent(ag_ed)
-    isControlledBy(pe0,ag_al,"creator")
-    isControlledBy(pe1,ag_bo,"author")
-    isControlledBy(pe2,ag_ch, "communicator")
-    isControlledBy(pe3,ag_da,"author")
-    isControlledBy(pe4,ag_ed, "communicator")
+    isComplementOf(e1,e0)
+    isComplementOf(e2,e0)
+    isComplementOf(e3,e0)
+    isComplementOf(e6,e3)
+
+    entity(a1, [ type: "Person", name: "Alice" ])
+    agent(a1)
+
+    entity(a2, [ type: "Person", name: "Bob" ])
+    agent(a2)
+
+    entity(a3, [ type: "Person", name: "Charles" ])
+    agent(a3)
+
+    entity(a4, [ type: "Person", name: "David" ])
+    agent(a4)
+
+    entity(a5, [ type: "Person", name: "Edith" ])
+    agent(a5)
+ 
+    isControlledBy(pe0,a1, creator)
+    isControlledBy(pe1,a2, author)
+    isControlledBy(pe2,a3, communicator)
+    isControlledBy(pe3,a4, author)
+    isControlledBy(pe4,a5, communicator)
 
 
   }