diff --git a/oxygen/js-options/options.js b/oxygen/js-options/options.js
index 8420702..2714b35 100644
--- a/oxygen/js-options/options.js
+++ b/oxygen/js-options/options.js
@@ -32,11 +32,14 @@ Options.prototype.setOption = function (key, value) {
 	this.optionsStorage.setOption(key, value);
 }
 
-Options.prototype.getOptions = function () {
-	var results = {
-	};
+Options.prototype.getOptionsKeys = function () {
 	this.optionsStorage.setOptionsDoctypePrefix(Options.SYSTEM);
-	var options = JSON.parse(this.optionsStorage.getOption(this.namespace, '{}'));
+	return JSON.parse(this.optionsStorage.getOption(this.namespace, '{}'));
+}
+
+Options.prototype.getOptions = function () {
+	var results = {};
+	var options = this.getOptionsKeys();
 	for (var key in options) {
 		results[key] = this.getOption(key, '');
 	}
@@ -95,3 +98,17 @@ Options.prototype.getSystemIdOptions = function () {
 	}
 	return this.systemIdOptions.getOptions();
 }
+
+Options.prototype.getSystemOptionKeys = function () {
+	if (this.systemIdOptions === undefined) {
+		this.setSystemId();
+	}
+	return this.systemIdOptions.getSystemOptionKeys();
+}
+
+Options.prototype.getSystemOptions = function () {
+	if (this.systemIdOptions === undefined) {
+		this.setSystemId();
+	}
+	return this.systemIdOptions.getSystemOptions();
+}