diff --git a/src/MiniDocs/LeSnippet.extension.st b/src/MiniDocs/LeSnippet.extension.st
index 101720d..04d9cbd 100644
--- a/src/MiniDocs/LeSnippet.extension.st
+++ b/src/MiniDocs/LeSnippet.extension.st
@@ -16,7 +16,7 @@ LeSnippet >> metadata [
 	| createEmailSanitized editEmailSanitized |
 	createEmailSanitized := self createEmail asString withoutXMLTagDelimiters.
 	editEmailSanitized := self editEmail asString withoutXMLTagDelimiters.
-	self optionAt: 'metadata' ifAbsentPut: [ Dictionary new ].
+	self optionAt: 'metadata' ifAbsentPut: [ OrderedDictionary new ].
 	^ (self optionAt: 'metadata')
 		  at: 'id' put: self uidString;
 		  at: 'parent' put: self parent uid asString36;
diff --git a/src/MiniDocs/OrderedDictionary.extension.st b/src/MiniDocs/OrderedDictionary.extension.st
index 7a83e28..a2e1efb 100644
--- a/src/MiniDocs/OrderedDictionary.extension.st
+++ b/src/MiniDocs/OrderedDictionary.extension.st
@@ -10,14 +10,7 @@ OrderedDictionary >> asLepiterSnippet [
 	| response |
 	self at: 'className' ifAbsent: [ ^ nil ].
 	response := (self at: 'className') asClass new.
-	response fromString: (self at: 'content').		
-	response
-		uid: (LeUID new uidString: (self at: 'id'));
-		parent: (self at: 'parent');
-		createTime: (LeTime new time: ((self at: 'created')asDateAndTime));
-		editTime: (LeTime new time: ((self at: 'modified') asDateAndTime));
-		editEmail: (self at: 'modifier');
-		createEmail: (self at: 'creator').	
+	response fromDictionary: self.	
 	self at: 'origin' ifPresent: [ response metadata at: 'origin' put: (self at: 'origin') ].
 	self at: 'errata' ifPresent: [ response metadata at: 'errata' put: (self at: 'errata') ].
 	^ response