diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexObjectAssembler.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexObjectAssembler.cs
index 2a9a88219f..788bfd3ced 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexObjectAssembler.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexObjectAssembler.cs
@@ -29,6 +29,8 @@ namespace Perspex.Markup.Xaml.Context
 
         public object Result => _objectAssembler.Result;
 
+        public InstanceLifeCycleHandler InstanceLifeCycleHandler { get; set; } = new InstanceLifeCycleHandler();
+
         public EventHandler<XamlSetValueEventArgs> XamlSetValueHandler { get; set; }
 
         public IWiringContext WiringContext => _objectAssembler.WiringContext;
diff --git a/src/Markup/Perspex.Markup.Xaml/OmniXAML b/src/Markup/Perspex.Markup.Xaml/OmniXAML
index f2673838c0..0904dcb071 160000
--- a/src/Markup/Perspex.Markup.Xaml/OmniXAML
+++ b/src/Markup/Perspex.Markup.Xaml/OmniXAML
@@ -1 +1 @@
-Subproject commit f2673838c0422ff0f6fdb3e4b34a5302971f59b5
+Subproject commit 0904dcb07175ca0cdf2ae1fda1434c0f1425a53e
diff --git a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
index 484363cd85..69b6143bbc 100644
--- a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
+++ b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
@@ -109,6 +109,7 @@
     <Compile Include="OmniXAML\Source\OmniXaml\IDeferredLoader.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IMarkupExtension.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\INameScope.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\InstanceLifeCycleHandler.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\InstructionNode.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\InstructionTreeBuilder.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IObjectAssembler.cs" />
@@ -119,6 +120,7 @@
     <Compile Include="OmniXAML\Source\OmniXaml\ITypeProvider.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IValueConverter.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IWiringContext.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\IXamlLoader.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IXamlParser.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IXamlParserFactory.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\IXamlXmlLoader.cs" />
@@ -130,6 +132,7 @@
     <Compile Include="OmniXAML\Source\OmniXaml\MemberReverserVisitor.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\NamespaceDeclaration.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\NamespacePrefix.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssemblerMixin.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssembler\Command.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssembler\Commands\EndMemberCommand.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssembler\Commands\EndObjectCommand.cs" />
@@ -141,6 +144,7 @@
     <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssembler\Commands\ValueCommand.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssembler\ConstructionArgument.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssembler\CurrentLevelWrapper.cs" />
+    <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssembler\InstanceLifeCycleNotifier.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssembler\InstanceProperties.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssembler\Level.cs" />
     <Compile Include="OmniXAML\Source\OmniXaml\ObjectAssembler\NullLevel.cs" />