diff --git a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs
index cd26f24a0a66345c6aa9842e12e3991dd8783a5c..8193a6c5d3ce5a094009cc4ea523799326905ea6 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationJobViewModel.cs
@@ -14,7 +14,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Document
         #region Implementation of IDocumentViewModel
         public string DocumentName { get; }
 
-        public XmlDocumentType DocumentType { get; }
+        public XmlDocumentType? DocumentType { get; }
 
         public DataSource DataSource => _jobEditViewModel.DataSource;
 
diff --git a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs
index d684390880cf1599306637018dde7daa779fdf75..8c4e61cf97e6ce5210a7534424d1f540dda5effe 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/Document/DeclarationTrailerJobDocumentViewModel.cs
@@ -13,7 +13,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Document
         private string _name = "";
         public string DocumentName { get => _name; }
 
-        public XmlDocumentType DocumentType { get; }
+        public XmlDocumentType? DocumentType { get; }
 
 		public DataSource DataSource => throw new System.NotImplementedException();
 
diff --git a/VECTO3GUI2020/ViewModel/Implementation/Document/SimulationOnlyDeclarationJob.cs b/VECTO3GUI2020/ViewModel/Implementation/Document/SimulationOnlyDeclarationJob.cs
index 650a6755df28bc928c63e2fd9f03969da500dce9..5017e0a0b887e9f840b0979ef88cbbd2c9ae499f 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/Document/SimulationOnlyDeclarationJob.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/Document/SimulationOnlyDeclarationJob.cs
@@ -18,10 +18,9 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Document
 			set => _documentName = value;
 		}
 
-		public XmlDocumentType DocumentType
+		public XmlDocumentType? DocumentType
 		{
 			get => _documentType;
-			set => _documentType = value;
 		}
 
 		public DataSource DataSource
@@ -33,7 +32,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Document
 		public IEditViewModel EditViewModel { get; set; }
 
 		private bool _selected;
-		private XmlDocumentType _documentType;
+		private XmlDocumentType? _documentType;
 		private string _documentName;
 		private DataSource _dataSource;
 
diff --git a/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs b/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs
index cd12c7d033a295b2026e419f2a3283765df7905d..8ee584f2645137b2a1a599ae6102b584142ddbb7 100644
--- a/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Interfaces/Document/IDocumentViewModel.cs
@@ -8,7 +8,7 @@ namespace VECTO3GUI2020.ViewModel.Interfaces.Document
     public interface IDocumentViewModel
     {
         string DocumentName { get; }
-        XmlDocumentType DocumentType { get; }
+        XmlDocumentType? DocumentType { get; }
 		DataSource DataSource { get; }
 		IEditViewModel EditViewModel { get; }
 		bool Selected { get; set; }
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
index 1202d2069b7bb4f4733b2fbcb9152aa784c63834..dd06e836f98b1b79622c37e977baa94b5a2936dd 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/CreateVifViewModel.cs
@@ -283,7 +283,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			if (path == null) {
 				return null;
 			}
-
+			
+			
 			var jsonJob = new JSONJob() {
 				Header = new JSONJobHeader() {
 					AppVersion = "Vecto3GUI2020",
@@ -453,8 +454,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			set => SetProperty(ref _documentName, value);
 		}
 
-
-		public XmlDocumentType DocumentType => throw new NotImplementedException();
+		//Remove this from
+		public XmlDocumentType? DocumentType => null;
 
 		public DataSource DataSource
 		{
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
index a18970ab18bb6bb3dc526b1cd6f70734a841f74f..385e3b5ac1e1953b800ae287d941400f822af5c3 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
@@ -291,7 +291,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 
 		public string DocumentName => Path.GetFileNameWithoutExtension(_inputData.DataSource.SourceFile);
 
-		public XmlDocumentType DocumentType => XmlDocumentType.MultistageOutputData;
+		public XmlDocumentType? DocumentType => XmlDocumentType.MultistageOutputData;
 
 		public DataSource DataSource => _dataSource;
 
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
index 29818686e841acd1cc0f8c306818a60d220b1b93..5a6d36aa54784a8b03fa04f9aed3517a20665b97 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
@@ -103,7 +103,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			set => SetProperty(ref _documentName, value);
 		}
 
-		public XmlDocumentType DocumentType => _documentType;
+		public XmlDocumentType? DocumentType => _documentType;
 
 		public DataSource DataSource
 		{