diff --git a/src/ic/edit-ic.js b/src/ic/edit-ic.js
index 16771b6..91b9de4 100644
--- a/src/ic/edit-ic.js
+++ b/src/ic/edit-ic.js
@@ -37,7 +37,7 @@ class EditICDialog extends React.Component {
       type: '',
       category: '',
       managedexternally: false,
-      startParameterScheme: {},
+      startParameterSchema: {},
       properties: {}
     };
   }
@@ -70,8 +70,13 @@ class EditICDialog extends React.Component {
           data.category = this.state.category;
         }
 
-        data.startParameterScheme = this.state.startParameterScheme
-        data.properties = this.state.properties
+        if (this.state.startParameterSchema !== {}) {
+          data.startParameterSchema = this.state.startParameterSchema;
+        }
+
+        if (this.state.properties !== {}) {
+          data.properties = this.state.properties;
+        }
 
         data.managedexternally = this.state.managedexternally;
 
@@ -93,8 +98,8 @@ class EditICDialog extends React.Component {
     }
   }
 
-  handleStartParameterSchemeChange(data) {
-    this.setState({ startParameterScheme: data });
+  handleStartParameterSchemaChange(data) {
+    this.setState({ startParameterSchema: data });
   }
 
   handlePropertiesChange(data) {
@@ -111,7 +116,7 @@ class EditICDialog extends React.Component {
       description: this.props.ic.description,
       category: this.props.ic.category,
       managedexternally: false,
-      startParameterScheme: this.props.ic.startParameterScheme,
+      startParameterSchema: this.props.ic.startParameterSchema,
       properties: this.props.ic.properties,
     });
   }
@@ -193,12 +198,12 @@ class EditICDialog extends React.Component {
             <FormControl type="text" placeholder={this.props.ic.description} value={this.state.description || '' } onChange={(e) => this.handleChange(e)} />
             <FormControl.Feedback />
           </FormGroup>
-          <FormGroup controlId='startParameterScheme'>
-            <FormLabel column={false}>Start parameter scheme of IC</FormLabel>
+          <FormGroup controlId='startParameterSchema'>
+            <FormLabel column={false}>Start parameter schema of IC</FormLabel>
             <ParametersEditor
-              content={this.state.startParameterScheme}
+              content={this.state.startParameterSchema}
               disabled={false}
-              onChange={(data) => this.handleStartParameterSchemeChange(data)}
+              onChange={(data) => this.handleStartParameterSchemaChange(data)}
             />
           </FormGroup>
           <FormGroup controlId='properties'>
diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js
index 1ad01ed..15c7a60 100644
--- a/src/ic/ic-dialog.js
+++ b/src/ic/ic-dialog.js
@@ -110,7 +110,7 @@ class ICDialog extends React.Component {
                 <Col><b>Start parameter schema</b></Col>
                 <Col>
                   <ReactJson
-                    src={this.props.ic.startParameterScheme}
+                    src={this.props.ic.startParameterSchema}
                     name={false}
                     displayDataTypes={false}
                     displayObjectSize={false}
diff --git a/src/ic/ic-store.js b/src/ic/ic-store.js
index b852b94..d892c7d 100644
--- a/src/ic/ic-store.js
+++ b/src/ic/ic-store.js
@@ -117,12 +117,7 @@ class InfrastructureComponentStore extends ArrayStore {
         if(!tempIC.managedexternally){
           tempIC.state = action.data.state;
           tempIC.uptime = action.data.time_now - action.data.time_started;
-          if (tempIC.statusupdateraw === null || tempIC.statusupdateraw === undefined){
-            tempIC.statusupdateraw = {};
-            tempIC.statusupdateraw["status"] = action.data;
-          } else {
-            tempIC.statusupdateraw["status"] = action.data;
-          }
+          tempIC.statusupdateraw = action.data
           AppDispatcher.dispatch({
             type: 'ics/start-edit',
             data: tempIC,
@@ -138,12 +133,10 @@ class InfrastructureComponentStore extends ArrayStore {
       case 'ics/nodestats-received':
         let tempIC2 = action.ic;
         if(!tempIC2.managedexternally){
-          if (tempIC2.statusupdateraw === null || tempIC2.statusupdateraw === undefined){
+          if (tempIC2.statusupdateraw === null || tempIC2.statusupdateraw === undefined) {
             tempIC2.statusupdateraw = {};
-            tempIC2.statusupdateraw["statistics"] = action.data;
-          } else {
-            tempIC2.statusupdateraw["statistics"] = action.data;
           }
+          tempIC2.statusupdateraw["statistics"] = action.data;
           AppDispatcher.dispatch({
             type: 'ics/start-edit',
             data: tempIC2,