1 files changed, 11 insertions, 0 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs
index fea07023f..412c72a01 100644
--- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs
+++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 using System.Linq;
 using Tango.DAL.Remote.DB;
 
@@ -78,6 +80,7 @@ namespace Tango.Integration.Observables
         /// </summary>
         [Column("ORGANIZATION_GUID")]
         [ForeignKey("Organization")]
+
         public  String OrganizationGuid
         {
             get 
@@ -98,6 +101,7 @@ namespace Tango.Integration.Observables
         /// </summary>
         [Column("MACHINE_VERSION_GUID")]
         [ForeignKey("MachineVersion")]
+
         public  String MachineVersionGuid
         {
             get 
@@ -118,6 +122,7 @@ namespace Tango.Integration.Observables
         /// </summary>
         [Column("CONFIGURATION_GUID")]
         [ForeignKey("Configuration")]
+
         public  String ConfigurationGuid
         {
             get 
@@ -137,6 +142,8 @@ namespace Tango.Integration.Observables
         /// Gets or sets the machine configuration.
         /// </summary>
 
+        [XmlIgnore]
+        [JsonIgnore]
         public virtual Configuration Configuration
         {
             get 
@@ -175,6 +182,8 @@ namespace Tango.Integration.Observables
         /// Gets or sets the machine machine versions.
         /// </summary>
 
+        [XmlIgnore]
+        [JsonIgnore]
         public virtual MachineVersion MachineVersion
         {
             get 
@@ -232,6 +241,8 @@ namespace Tango.Integration.Observables
         /// Gets or sets the machine organization.
         /// </summary>
 
+        [XmlIgnore]
+        [JsonIgnore]
         public virtual Organization Organization
         {
             get