diff --git a/js/authoring/models/contextInfoModel.js b/js/authoring/models/contextInfoModel.js
index cdd8d66d212e2fb995063ad26dc116110c959524..3d33f5e84dfeca0cecc5dad2da567124a6156b57 100644
--- a/js/authoring/models/contextInfoModel.js
+++ b/js/authoring/models/contextInfoModel.js
@@ -13,8 +13,9 @@ function ContextInformation() {
     this._min = "";
     this._max = "";
     this._default = "";
-    this._inputValue = "";
+    this._chosenValue = "";
     this._operators = [];
+    this._chosenOperator = "";
     this._enums = [];
     this._parameters = [];
 
@@ -46,14 +47,18 @@ ContextInformation.prototype.getDefault = function () {
     return this._default;
 };
 
-ContextInformation.prototype.getInputValue = function () {
-    return this._inputValue;
+ContextInformation.prototype.getChosenValue = function () {
+    return this._chosenValue;
 };
 
 ContextInformation.prototype.getOperators = function () {
     return this._operators;
 };
 
+ContextInformation.prototype.getChosenOperator = function () {
+    return this._chosenOperator;
+};
+
 ContextInformation.prototype.getEnums = function () {
     return this._enums;
 };
@@ -90,14 +95,18 @@ ContextInformation.prototype.setDefault = function (def) {
         this._default = def;
 };
 
-ContextInformation.prototype.setInputValue = function (value) {
-    this._inputValue = value;
+ContextInformation.prototype.setChosenValue = function (value) {
+    this._chosenValue = value;
 };
 
 ContextInformation.prototype.setOperators = function (operators) {
     this._operators = operators;
 };
 
+ContextInformation.prototype.setChosenOperator = function (operator) {
+    this._chosenOperator = operator;
+};
+
 ContextInformation.prototype.setEnums = function (enums) {
     this._enums = enums;
 };
diff --git a/js/authoring/models/parameterModel.js b/js/authoring/models/parameterModel.js
index be3014f4d2dd88ca9f7445000422880ce8f0a697..7f784bca51810038b03415941f06096175296b2b 100644
--- a/js/authoring/models/parameterModel.js
+++ b/js/authoring/models/parameterModel.js
@@ -9,7 +9,7 @@ function Parameter() {
     this._min = "";
     this._max = "";
     this._default = "";
-    this._inputValue = "";
+    this._chosenValue = "";
     this._enums = [];
 
     return this;
@@ -36,8 +36,8 @@ Parameter.prototype.getDefault = function () {
     return this._default;
 };
 
-Parameter.prototype.getInputValue = function () {
-    return this._inputValue;
+Parameter.prototype.getChosenValue = function () {
+    return this._chosenValue;
 };
 
 Parameter.prototype.getEnums = function () {
@@ -69,8 +69,8 @@ Parameter.prototype.setDefault = function (def) {
         this._default = def;
 };
 
-Parameter.prototype.setInputValue = function (value) {
-    this._inputValue = value;
+Parameter.prototype.setChosenValue = function (value) {
+    this._chosenValue = value;
 };
 
 Parameter.prototype.setEnums = function (enums) {