diff --git a/app/Umbraco/Archetype.Courier/DataResolvers/ArchetypeDataResolver.cs b/app/Umbraco/Archetype.Courier/DataResolvers/ArchetypeDataResolver.cs
index 9040479..10fd3cb 100644
--- a/app/Umbraco/Archetype.Courier/DataResolvers/ArchetypeDataResolver.cs
+++ b/app/Umbraco/Archetype.Courier/DataResolvers/ArchetypeDataResolver.cs
@@ -77,7 +77,7 @@ namespace Archetype.Courier.DataResolvers
 			if (propertyData != null && propertyData.Value != null)
 			{
 				// just look at the amount of dancing around we have to do in order to fake a `PublishedPropertyType`?!
-				var dataTypeId = PersistenceManager.Default.GetNodeId(propertyData.DataType, NodeObjectTypes.DataType);
+				var dataTypeId = ExecutionContext.DatabasePersistence.GetNodeId(propertyData.DataType, NodeObjectTypes.DataType);
 				var fakePropertyType = this.CreateDummyPropertyType(dataTypeId, this.EditorAlias);
 
 				var converter = new ArchetypeValueConverter();
@@ -103,7 +103,7 @@ namespace Archetype.Courier.DataResolvers
 								new ContentProperty
 								{
 									Alias = property.Alias,
-									DataType = PersistenceManager.Default.GetUniqueId(property.DataTypeId, NodeObjectTypes.DataType),
+									DataType = ExecutionContext.DatabasePersistence.GetUniqueId(property.DataTypeId, NodeObjectTypes.DataType),
 									PropertyEditorAlias = property.PropertyEditorAlias,
 									Value = property.Value
 								}
@@ -154,16 +154,8 @@ namespace Archetype.Courier.DataResolvers
 						}
 					}
 
-					if (item.Name.Contains(string.Concat(this.EditorAlias, ": Nested")))
-					{
-						// if the Archetype is nested, then we only want to return the object itself - not a serialized string
-						propertyData.Value = archetype;
-					}
-					else
-					{
-						// if the Archetype is the root/container, then we can serialize it to a string
-						propertyData.Value = archetype.SerializeForPersistence();
-					}
+					// serialize the Archetype back to a string
+					propertyData.Value = archetype.SerializeForPersistence();
 				}
 			}
 		}
diff --git a/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.Core.dll b/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.Core.dll
index b690a35..12e35bd 100644
Binary files a/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.Core.dll and b/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.Core.dll differ
diff --git a/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.DataResolvers.dll b/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.DataResolvers.dll
index 88534f5..8234a1b 100644
Binary files a/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.DataResolvers.dll and b/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.DataResolvers.dll differ
diff --git a/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.Providers.dll b/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.Providers.dll
index 07910fc..dd276b8 100644
Binary files a/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.Providers.dll and b/app/Umbraco/Archetype.Courier/lib/Umbraco.Courier.Providers.dll differ