diff --git a/karma.conf.js b/karma.conf.js
index bdfc6d5..cb4f0dd 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -18,7 +18,7 @@ module.exports = function (config) {
 
             // all files, including non-commonJS files you need to load before your test cases
             files: [
-                'src/js/brutusin-json-forms.js',
+                //'src/js/brutusin-json-forms.js',
                 'test/index.spec.js'
             ],
 
diff --git a/src/js/brutusin-json-forms.js b/src/js/brutusin-json-forms.js
index dbc27d0..122d298 100644
--- a/src/js/brutusin-json-forms.js
+++ b/src/js/brutusin-json-forms.js
@@ -1,1188 +1,1199 @@
-/*
- * Copyright 2015 brutusin.org
- *
- * Licensed under the Apache License, Version 2.0 (the "SuperLicense");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @author Ignacio del Valle Alles idelvall@brutusin.org
- */
-
-if (typeof brutusin === "undefined") {
-    window.brutusin = new Object();
-} else if (typeof brutusin !== "object") {
-    throw ("brutusin global variable already exists");
-}
-
-(function () {
-    if (!String.prototype.startsWith) {
-        String.prototype.startsWith = function (searchString, position) {
-            position = position || 0;
-            return this.indexOf(searchString, position) === position;
-        };
-    }
-    if (!String.prototype.endsWith) {
-        String.prototype.endsWith = function (searchString, position) {
-            var subjectString = this.toString();
-            if (position === undefined || position > subjectString.length) {
-                position = subjectString.length;
-            }
-            position -= searchString.length;
-            var lastIndex = subjectString.indexOf(searchString, position);
-            return lastIndex !== -1 && lastIndex === position;
-        };
-    }
-    if (!String.prototype.includes) {
-        String.prototype.includes = function () {
-            'use strict';
-            return String.prototype.indexOf.apply(this, arguments) !== -1;
-        };
-    }
-    if (!String.prototype.format) {
-        String.prototype.format = function () {
-            var formatted = this;
-            for (var i = 0; i < arguments.length; i++) {
-                var regexp = new RegExp('\\{' + i + '\\}', 'gi');
-                formatted = formatted.replace(regexp, arguments[i]);
-            }
-            return formatted;
-        };
-    }
-
-    var BrutusinForms = new Object();
-    BrutusinForms.messages = {
-        "validationError": "Validation error",
-        "required": "This field is **required**",
-        "invalidValue": "Invalid field value",
-        "addpropNameExistent": "This property is already present in the object",
-        "addpropNameRequired": "A name is required",
-        "minItems": "At least `{0}` items are required",
-        "maxItems": "At most `{0}` items are allowed",
-        "pattern": "Value does not match pattern: `{0}`",
-        "minLength": "Value must be **at least** `{0}` characters long",
-        "maxLength": "Value must be **at most** `{0}` characters long",
-        "multipleOf": "Value must be **multiple of** `{0}`",
-        "minimum": "Value must be **greater or equal than** `{0}`",
-        "exclusiveMinimum": "Value must be **greater than** `{0}`",
-        "maximum": "Value must be **lower or equal than** `{0}`",
-        "exclusiveMaximum": "Value must be **lower than** `{0}`",
-        "minProperties": "At least `{0}` properties are required",
-        "maxProperties": "At most `{0}` properties are allowed"
-
-    };
-
-    /**
-     * Callback functions to be notified after an HTML element has been rendered (passed as parameter).
-     * @type type
-     */
-    BrutusinForms.decorators = new Array();
-
-    BrutusinForms.addDecorator = function (f) {
-        BrutusinForms.decorators[BrutusinForms.decorators.length] = f;
-    };
-
-    BrutusinForms.onResolutionStarted = function (element) {
-    };
-
-    BrutusinForms.onResolutionFinished = function (element) {
-    };
-
-    BrutusinForms.onValidationError = function (element, message) {
-        element.focus();
-        if (!element.className.includes(" error")) {
-            element.className += " error";
-        }
-        alert(message);
-    };
-
-    BrutusinForms.onValidationSuccess = function (element) {
-        element.className = element.className.replace(" error", "");
-    };
-
-    /**
-     * Callback function to be notified after a form has been rendered (passed as parameter).
-     * @type type
-     */
-    BrutusinForms.postRender = null;
-    /**
-     * BrutusinForms instances created in the document
-     * @type Array
-     */
-    BrutusinForms.instances = new Array();
-    /**
-     * BrutusinForms factory method
-     * @param {type} schema schema object
-     * @returns {BrutusinForms.create.obj|Object|Object.create.obj}
-     */
-    BrutusinForms.create = function (schema) {
-        var SCHEMA_ANY = {"type": "any"};
-        var obj = new Object();
-
-        var schemaMap = new Object();
-        var dependencyMap = new Object();
-        var renderInfoMap = new Object();
-        var container;
-        var data;
-        var error;
-        var initialValue;
-        var inputCounter = 0;
-        var formId = "BrutusinForms#" + BrutusinForms.instances.length;
-        populateSchemaMap("$", schema);
-
-        validateDepencyMapIsAcyclic();
-
-        var renderers = new Object();
-
-        renderers["integer"] = function (container, id, parentObject, propertyProvider, value) {
-            renderers["string"](container, id, parentObject, propertyProvider, value);
-        };
-
-        renderers["number"] = function (container, id, parentObject, propertyProvider, value) {
-            renderers["string"](container, id, parentObject, propertyProvider, value);
-        };
-
-        renderers["any"] = function (container, id, parentObject, propertyProvider, value) {
-            renderers["string"](container, id, parentObject, propertyProvider, value);
-        };
-
-        renderers["string"] = function (container, id, parentObject, propertyProvider, value) {
-            var schemaId = getSchemaId(id);
-            var s = getSchema(schemaId);
-            var input;
-            if (s.type === "any") {
-                input = document.createElement("textarea");
-                if (value) {
-                    input.value = JSON.stringify(value, null, 4);
-                }
-            } else if (s.enum) {
-                input = document.createElement("select");
-                if (!s.required) {
-                    var option = document.createElement("option");
-                    var textNode = document.createTextNode("");
-                    option.value = "";
-                    appendChild(option, textNode, s);
-                    appendChild(input, option, s);
-                }
-                var selectedIndex = 0;
-                for (var i = 0; i < s.enum.length; i++) {
-                    var option = document.createElement("option");
-                    var textNode = document.createTextNode(s.enum[i]);
-                    option.value = s.enum[i];
-                    appendChild(option, textNode, s);
-                    appendChild(input, option, s);
-                    if (value && s.enum[i] === value) {
-                        selectedIndex = i;
-                        if (!s.required) {
-                            selectedIndex++;
-                        }
-                    }
-                }
-                input.selectedIndex = selectedIndex;
-            } else {
-                input = document.createElement("input");
-                if (s.type === "integer" || s.type === "number") {
-                    input.type = "number";
-                    input.step = "any";
-                    if (typeof value !== "number") {
-                        value = null;
-                    }
-                } else if (s.format === "date-time") {
-                    input.type = "datetime-local";
-                } else if (s.format === "email") {
-                    input.type = "email";
-                } else if (s.format === "text") {
-                    input = document.createElement("textarea");
-                } else {
-                    input.type = "text";
-                }
-                if (value !== null && typeof value !== "undefined") {
-                    input.value = value;
-                }
-            }
-            input.schema = schemaId;
-            input.setAttribute("autocorrect", "off");
-
-            input.getValidationError = function () {
-                try {
-                    var value = getValue(s, input);
-                    if (value === null) {
-                        if (s.required) {
-                            return BrutusinForms.messages["required"];
-                        }
-                    } else {
-                        if (s.pattern && !s.pattern.test(value)) {
-                            return BrutusinForms.messages["pattern"].format(s.pattern.source);
-                        }
-                        if (s.minLength) {
-                            if (!value || s.minLength > value.length) {
-                                return BrutusinForms.messages["minLength"].format(s.minLength);
-                            }
-                        }
-                        if (s.maxLength) {
-                            if (value && s.maxLength < value.length) {
-                                return BrutusinForms.messages["maxLength"].format(s.maxLength);
-                            }
-                        }
-                    }
-                    if (value !== null && !isNaN(value)) {
-                        if (s.multipleOf && value % s.multipleOf !== 0) {
-                            return BrutusinForms.messages["multipleOf"].format(s.multipleOf);
-                        }
-                        if (s.hasOwnProperty("maximum")) {
-                            if (s.exclusiveMaximum && value >= s.maximum) {
-                                return BrutusinForms.messages["exclusiveMaximum"].format(s.maximum);
-                            } else if (!s.exclusiveMaximum && value > s.maximum) {
-                                return BrutusinForms.messages["maximum"].format(s.maximum);
-                            }
-                        }
-                        if (s.hasOwnProperty("minimum")) {
-                            if (s.exclusiveMinimum && value <= s.minimum) {
-                                return BrutusinForms.messages["exclusiveMinimum"].format(s.minimum);
-                            } else if (!s.exclusiveMinimum && value < s.minimum) {
-                                return BrutusinForms.messages["minimum"].format(s.minimum);
-                            }
-                        }
-                    }
-                } catch (error) {
-                    return BrutusinForms.messages["invalidValue"];
-                }
-            };
-
-            input.onchange = function () {
-                var value;
-                try {
-                    value = getValue(s, input);
-                } catch (error) {
-                    value = null;
-                }
-                if (parentObject) {
-                    parentObject[propertyProvider.getValue()] = value;
-                } else {
-                    data = value;
-                }
-                onDependencyChanged(schemaId, input);
-            };
-
-            if (s.description) {
-                input.title = s.description;
-                input.placeholder = s.description;
-            }
-//        if (s.pattern) {
-//            input.pattern = s.pattern;
-//        }
-//        if (s.required) {
-//            input.required = true;
-//        }
-//       
-//        if (s.minimum) {
-//            input.min = s.minimum;
-//        }
-//        if (s.maximum) {
-//            input.max = s.maximum;
-//        }
-            input.onchange();
-            input.id = getInputId();
-            inputCounter++;
-            appendChild(container, input, s);
-            return parentObject;
-        };
-
-        renderers["boolean"] = function (container, id, parentObject, propertyProvider, value) {
-            var schemaId = getSchemaId(id);
-            var s = getSchema(schemaId);
-            var input = document.createElement("input");
-            input.type = "checkbox";
-            input.schema = schemaId;
-            input.onchange = function () {
-                if (parentObject) {
-                    parentObject[propertyProvider.getValue()] = getValue(s, input);
-                } else {
-                    data = getValue(s, input);
-                }
-                onDependencyChanged(schemaId, input);
-            };
-            if (value === true) {
-                input.checked = true;
-            }
-            input.id = getInputId();
-            inputCounter++;
-            if (s.description) {
-                input.title = s.description;
-            }
-            input.onchange();
-            appendChild(container, input, s);
-        };
-        
-        renderers["oneOf"] = function (container, id, parentObject, propertyProvider, value) {
-            var schemaId = getSchemaId(id);
-            var s = getSchema(schemaId);
-            var input = document.createElement("select");
-            var display = document.createElement("div");
-            display.innerHTML = "";
-            input.type = "select";
-            input.schema = schemaId;
-            var noption = document.createElement("option");
-            noption.value = null;
-            appendChild(input, noption, s);
-            for (var i = 0; i < s.oneOf.length; i++) {
-                var option = document.createElement("option");
-                var propId = id + "." + i;
-                var ss = getSchema(propId);
-                var textNode = document.createTextNode(ss.title);
-                option.value = s.oneOf[i];
-                appendChild(option, textNode, s);
-                appendChild(input, option, s);
-            }
-            input.onchange = function () {
-                render(null, display, id + "." + (input.selectedIndex - 1), parentObject, propertyProvider, value);
-            };
-            appendChild(container, input, s);
-            appendChild(container, display, s);
-        };
-        
-        renderers["object"] = function (container, id, parentObject, propertyProvider, value) {
-
-            function createStaticPropertyProvider(propname) {
-                var ret = new Object();
-                ret.getValue = function () {
-                    return propname;
-                };
-                ret.onchange = function (oldName) {
-                };
-                return ret;
-            }
-
-            function addAdditionalProperty(current, table, id, name, value) {
-                var schemaId = getSchemaId(id);
-                var s = getSchema(schemaId);
-                var tbody = table.tBodies[0];
-                var tr = document.createElement("tr");
-                var td1 = document.createElement("td");
-                td1.className = "add-prop-name";
-                var innerTab = document.createElement("table");
-                var innerTr = document.createElement("tr");
-                var innerTd1 = document.createElement("td");
-                var innerTd2 = document.createElement("td");
-                var keyForBlank = "$" + Object.keys(current).length + "$";
-                var td2 = document.createElement("td");
-                td2.className = "prop-value";
-                var nameInput = document.createElement("input");
-                nameInput.type = "text";
-                nameInput.getValidationError = function () {
-                    if (nameInput.previousValue !== nameInput.value) {
-                        if (current.hasOwnProperty(nameInput.value)) {
-                            return BrutusinForms.messages["addpropNameExistent"];
-                        }
-                    }
-                    if (!nameInput.value) {
-                        return BrutusinForms.messages["addpropNameRequired"];
-                    }
-                };
-                var pp = createPropertyProvider(
-                        function () {
-                            if (nameInput.value) {
-                                return nameInput.value;
-                            } else {
-                                return keyForBlank;
-                            }
-                        },
-                        function (oldPropertyName) {
-                            if (pp.getValue() === oldPropertyName) {
-                                return;
-                            }
-                            if (!oldPropertyName) {
-                                oldPropertyName = keyForBlank;
-                            }
-                            if (oldPropertyName && current.hasOwnProperty(oldPropertyName)) {
-                                current[pp.getValue()] = current[oldPropertyName];
-                                delete current[oldPropertyName];
-                            }
-                        });
-
-                nameInput.onblur = function () {
-                    if (nameInput.previousValue !== nameInput.value) {
-                        var name = nameInput.value;
-                        var i = 1;
-                        while (nameInput.previousValue !== name && current.hasOwnProperty(name)) {
-                            name = nameInput.value + "(" + i + ")";
-                            i++;
-                        }
-                        nameInput.value = name;
-                        pp.onchange(nameInput.previousValue);
-                        nameInput.previousValue = nameInput.value;
-                        return;
-                    }
-                };
-                var removeButton = document.createElement("button");
-                removeButton.setAttribute('type', 'button');
-                removeButton.className = "remove";
-                appendChild(removeButton, document.createTextNode("x"), s);
-                removeButton.onclick = function () {
-                    delete current[nameInput.value];
-                    table.deleteRow(tr.rowIndex);
-                    nameInput.value = null;
-                    pp.onchange(nameInput.previousValue);
-                };
-
-                appendChild(innerTd1, nameInput, s);
-                appendChild(innerTd2, removeButton, s);
-                appendChild(innerTr, innerTd1, s);
-                appendChild(innerTr, innerTd2, s);
-                appendChild(innerTab, innerTr, s);
-                appendChild(td1, innerTab, s);
-                appendChild(tr, td1, s);
-                appendChild(tr, td2, s);
-                appendChild(tbody, tr, s);
-                appendChild(table, tbody, s);
-                render(null, td2, id, current, pp, value);
-                if (name) {
-                    nameInput.value = name;
-                    nameInput.onblur();
-                }
-            }
-
-            var schemaId = getSchemaId(id);
-            var s = getSchema(schemaId);
-            var current = new Object();
-            if (!parentObject) {
-                data = current;
-            } else {
-                if (propertyProvider.getValue() || propertyProvider.getValue() === 0) {
-                    parentObject[propertyProvider.getValue()] = current;
-                }
-            }
-            var table = document.createElement("table");
-            table.className = "object";
-            var tbody = document.createElement("tbody");
-            appendChild(table, tbody, s);
-            var propNum = 0;
-            if (s.hasOwnProperty("properties")) {
-                propNum = s.properties.length;
-                for (var prop in s.properties) {
-                    var tr = document.createElement("tr");
-                    var td1 = document.createElement("td");
-                    td1.className = "prop-name";
-                    var propId = id + "." + prop;
-                    var td2 = document.createElement("td");
-                    td2.className = "prop-value";
-                    appendChild(tbody, tr, s);
-                    appendChild(tr, td1, s);
-                    appendChild(tr, td2, s);
-                    var pp = createStaticPropertyProvider(prop);
-                    var propInitialValue = null;
-                    if (value) {
-                        propInitialValue = value[prop];
-                    }
-                    render(td1, td2, propId, current, pp, propInitialValue);
-                }
-            }
-            if (s.additionalProperties) {
-                var addPropS = getSchema(s.additionalProperties);
-                var div = document.createElement("div");
-                appendChild(div, table, s);
-                var addButton = document.createElement("button");
-                addButton.setAttribute('type', 'button');
-                addButton.onclick = function () {
-                    addAdditionalProperty(current, table, id + "[*]");
-                };
-                if (s.maxProperties || s.minProperties) {
-                    addButton.getValidationError = function () {
-                        if (s.minProperties && propNum + table.rows.length < s.minProperties) {
-                            return BrutusinForms.messages["minProperties"].format(s.minProperties);
-                        }
-                        if (s.maxProperties && propNum + table.rows.length > s.maxProperties) {
-                            return BrutusinForms.messages["maxProperties"].format(s.maxProperties);
-                        }
-                    };
-                }
-                if (addPropS.description) {
-                    addButton.title = addPropS.description;
-                }
-                appendChild(addButton, document.createTextNode("Add"), s);
-                appendChild(div, addButton, s);
-                if (value) {
-                    for (var p in value) {
-                        if (s.properties.hasOwnProperty(p)) {
-                            continue;
-                        }
-                        addAdditionalProperty(current, table, id + "[\"" + prop + "\"]", p, value[p]);
-                    }
-                }
-                appendChild(container, div, s);
-            } else {
-                appendChild(container, table, s);
-            }
-        };
-        // end of object renderer
-        renderers["array"] = function (container, id, parentObject, propertyProvider, value) {
-            function addItem(current, table, id, value) {
-                var schemaId = getSchemaId(id);
-                var s = getSchema(schemaId);
-                var tbody = document.createElement("tbody");
-                var tr = document.createElement("tr");
-                tr.className = "item";
-                var td1 = document.createElement("td");
-                td1.className = "item-index";
-                var td2 = document.createElement("td");
-                td2.className = "item-action";
-                var td3 = document.createElement("td");
-                td3.className = "item-value";
-                var removeButton = document.createElement("button");
-                removeButton.setAttribute('type', 'button');
-                removeButton.className = "remove";
-                appendChild(removeButton, document.createTextNode("x"), s);
-                var computRowCount = function () {
-                    for (var i = 0; i < table.rows.length; i++) {
-                        var row = table.rows[i];
-                        row.cells[0].innerHTML = i + 1;
-                    }
-                };
-                removeButton.onclick = function () {
-                    current.splice(tr.rowIndex, 1);
-                    table.deleteRow(tr.rowIndex);
-                    computRowCount();
-                };
-                appendChild(td2, removeButton, s);
-                var number = document.createTextNode(table.rows.length + 1);
-                appendChild(td1, number, s);
-                appendChild(tr, td1, s);
-                appendChild(tr, td2, s);
-                appendChild(tr, td3, s);
-                appendChild(tbody, tr, s);
-                appendChild(table, tbody, s);
-                var pp = createPropertyProvider(function () {
-                    return tr.rowIndex;
-                });
-                render(null, td3, id, current, pp, value);
-            }
-
-            var schemaId = getSchemaId(id);
-            var s = getSchema(schemaId);
-            var itemS = getSchema(s.items);
-            var current = new Array();
-            if (!parentObject) {
-                data = current;
-            } else {
-                if (propertyProvider.getValue() || propertyProvider.getValue() === 0) {
-                    parentObject[propertyProvider.getValue()] = current;
-                }
-            }
-            if (propertyProvider) {
-                propertyProvider.onchange = function (oldPropertyName) {
-                    delete parentObject[oldPropertyName];
-                    parentObject[propertyProvider.getValue()] = current;
-                };
-            }
-            var div = document.createElement("div");
-            var table = document.createElement("table");
-            table.className = "array";
-            appendChild(div, table, s);
-            appendChild(container, div, s);
-            var addButton = document.createElement("button");
-            addButton.setAttribute('type', 'button');
-            addButton.getValidationError = function () {
-                if (s.minItems && s.minItems > table.rows.length) {
-                    return BrutusinForms.messages["minItems"].format(s.minItems);
-                }
-                if (s.maxItems && s.maxItems < table.rows.length) {
-                    return BrutusinForms.messages["maxItems"].format(s.maxItems);
-                }
-            };
-            addButton.onclick = function () {
-                addItem(current, table, id + "[#]", null);
-            };
-            if (itemS.description) {
-                addButton.title = itemS.description;
-            }
-            appendChild(addButton, document.createTextNode("Add item"), s);
-            appendChild(div, table, s);
-            appendChild(div, addButton, s);
-            if (value && value instanceof Array) {
-                for (var i = 0; i < value.length; i++) {
-                    addItem(current, table, id + "[" + i + "]", value[i]);
-                }
-            }
-            appendChild(container, div, s);
-        };
-        // end of array render
-        /**
-         * Renders the form inside the the container, with the specified data preloaded
-         * @param {type} c container
-         * @param {type} data json data
-         * @returns {undefined}
-         */
-        obj.render = function (c, data) {
-            container = c;
-            initialValue = data;
-            var form = document.createElement("form");
-            form.className = "brutusin-form";
-            form.onsubmit = function (event) {
-                return false;
-            };
-            if (container) {
-                appendChild(container, form);
-            } else {
-                appendChild(document.body, form);
-            }
-            if (error) {
-                var errLabel = document.createElement("label");
-                var errNode = document.createTextNode(error);
-                appendChild(errLabel, errNode);
-                errLabel.className = "error-message";
-                appendChild(form, errLabel);
-            } else {
-                render(null, form, "$", null, null);
-            }
-            rendered = true;
-            if (dependencyMap.hasOwnProperty("$")) {
-                onDependencyChanged("$");
-            }
-            if (BrutusinForms.postRender) {
-                BrutusinForms.postRender(obj);
-            }
-        };
-
-        obj.getRenderingContainer = function () {
-            return container;
-        };
-
-        obj.validate = function () {
-            return validate(container);
-        };
-
-        obj.getData = function () {
-            function removeEmptiesAndNulls(object) {
-                if (object instanceof Array) {
-                    if (object.length === 0) {
-                        return null;
-                    }
-                    var clone = new Array();
-                    for (var i = 0; i < object.length; i++) {
-                        clone[i] = removeEmptiesAndNulls(object[i]);
-                    }
-                    return clone;
-                } else if (object === "") {
-                    return null;
-                } else if (object instanceof Object) {
-                    var clone = new Object();
-                    for (var prop in object) {
-                        if (prop.startsWith("$") && prop.endsWith("$")) {
-                            continue;
-                        }
-                        var value = removeEmptiesAndNulls(object[prop]);
-                        if (value !== null) {
-                            clone[prop] = value;
-                        }
-                    }
-                    return clone;
-                } else {
-                    return object;
-                }
-            }
-            if (!container) {
-                return null;
-            } else {
-                return removeEmptiesAndNulls(data);
-                ;
-            }
-        };
-
-        BrutusinForms.instances[BrutusinForms.instances.length] = obj;
-
-        return obj;
-
-        function validateDepencyMapIsAcyclic() {
-            function dfs(visitInfo, stack, id) {
-                if (stack.hasOwnProperty(id)) {
-                    error = "Schema dependency graph has cycles";
-                    return;
-                }
-                stack[id] = null;
-                if (visitInfo.hasOwnProperty(id)) {
-                    return;
-                }
-                visitInfo[id] = null;
-                var arr = dependencyMap[id];
-                if (arr) {
-                    for (var i = 0; i < arr.length; i++) {
-                        dfs(visitInfo, stack, arr[i]);
-                    }
-                }
-                delete stack[id];
-            }
-            var visitInfo = new Object();
-            for (var id in dependencyMap) {
-                if (visitInfo.hasOwnProperty(id)) {
-                    continue;
-                }
-                dfs(visitInfo, new Object(), id);
-            }
-        }
-
-        function appendChild(parent, child, schema) {
-            parent.appendChild(child);
-            for (var i = 0; i < BrutusinForms.decorators.length; i++) {
-                BrutusinForms.decorators[i](child, schema);
-            }
-        }
-
-        function createPseudoSchema(schema) {
-            var pseudoSchema = new Object();
-            for (var p in schema) {
-                if (p === "items" || p === "properties" || p === "additionalProperties") {
-                    continue;
-                }
-                if (p === "pattern") {
-                    pseudoSchema[p] = new RegExp(schema[p]);
-                } else {
-                    pseudoSchema[p] = schema[p];
-                }
-
-            }
-            return pseudoSchema;
-        }
-
-        function populateSchemaMap(name, schema) {
-            var pseudoSchema = createPseudoSchema(schema);
-            schemaMap[name] = pseudoSchema;
-            if (schema.type === "object") {
-                if (schema.properties) {
-                    pseudoSchema.properties = new Object();
-                    for (var prop in schema.properties) {
-                        var childProp = name + "." + prop;
-                        pseudoSchema.properties[prop] = childProp;
-                        populateSchemaMap(childProp, schema.properties[prop]);
-                    }
-                }
-                if (schema.additionalProperties) {
-                    var childProp = name + "[*]";
-                    pseudoSchema.additionalProperties = childProp;
-                    if (schema.additionalProperties.hasOwnProperty("type")) {
-                        populateSchemaMap(childProp, schema.additionalProperties);
-                    } else {
-                        populateSchemaMap(childProp, SCHEMA_ANY);
-                    }
-                }
-            } else if (schema.type === "array") {
-                pseudoSchema.items = name + "[#]";
-                populateSchemaMap(pseudoSchema.items, schema.items);
-            } else if (schema.hasOwnProperty("oneOf")) {
-                pseudoSchema.oneOf = new Array();
-                pseudoSchema.type = "oneOf";
-                for (var i in schema.oneOf) {
-                    // console.log(schema.oneOf[i]);
-                    var childProp = name + "." + i;
-                    pseudoSchema.oneOf[i] = childProp;
-                    populateSchemaMap(childProp, schema.oneOf[i]);
-                }
-            }
-            if (schema.hasOwnProperty("dependsOn")) {
-                if (schema.dependsOn === null) {
-                    schema.dependsOn = ["$"];
-                }
-                var arr = new Array();
-                for (var i = 0; i < schema.dependsOn.length; i++) {
-                    if (!schema.dependsOn[i]) {
-                        arr[i] = "$";
-                        // Relative cases 
-                    } else if (schema.dependsOn[i].startsWith("$")) {
-                        arr[i] = schema.dependsOn[i];
-                        // Relative cases 
-                    } else if (name.endsWith("]")) {
-                        arr[i] = name + "." + schema.dependsOn[i];
-                    } else {
-                        arr[i] = name.substring(0, name.lastIndexOf(".")) + "." + schema.dependsOn[i];
-                    }
-                }
-                schemaMap[name].dependsOn = arr;
-                for (var i = 0; i < arr.length; i++) {
-                    var entry = dependencyMap[arr[i]];
-                    if (!entry) {
-                        entry = new Array();
-                        dependencyMap[arr[i]] = entry;
-                    }
-                    entry[entry.length] = name;
-                }
-            }
-        }
-
-        function renderTitle(container, title, schema) {
-            if (container) {
-                if (title) {
-                    var titleLabel = document.createElement("label");
-                    if (schema.type !== "any" && schema.type !== "object" && schema.type !== "array") {
-                        titleLabel.htmlFor = getInputId();
-                    }
-                    var titleNode = document.createTextNode(title + ":");
-                    appendChild(titleLabel, titleNode, schema);
-                    if (schema.description) {
-                        titleLabel.title = schema.description;
-                    }
-                    if (schema.required) {
-                        var sup = document.createElement("sup");
-                        appendChild(sup, document.createTextNode("*"), schema);
-                        appendChild(titleLabel, sup, schema);
-                        titleLabel.className = "required";
-                    }
-                    appendChild(container, titleLabel, schema);
-                }
-            }
-        }
-
-        function getInputId() {
-            return formId + "_" + inputCounter;
-        }
-
-        function validate(element) {
-            var ret = true;
-            if (element.hasOwnProperty("getValidationError")) {
-                var error = element.getValidationError();
-                if (error) {
-                    BrutusinForms.onValidationError(element, error);
-                    ret = false;
-                } else {
-                    BrutusinForms.onValidationSuccess(element);
-                }
-            }
-            if (element.childNodes) {
-                for (var i = 0; i < element.childNodes.length; i++) {
-                    if (!validate(element.childNodes[i])) {
-                        ret = false;
-                    }
-                }
-            }
-            return ret;
-        }
-
-        function clear(container) {
-            if (container) {
-                while (container.firstChild) {
-                    container.removeChild(container.firstChild);
-                }
-            }
-        }
-
-        function render(titleContainer, container, id, parentObject, propertyProvider, value) {
-            //console.log(id);
-            var schemaId = getSchemaId(id);
-            var s = getSchema(schemaId);
-            renderInfoMap[schemaId] = new Object();
-            renderInfoMap[schemaId].titleContainer = titleContainer;
-            renderInfoMap[schemaId].container = container;
-            renderInfoMap[schemaId].parentObject = parentObject;
-            renderInfoMap[schemaId].propertyProvider = propertyProvider;
-            renderInfoMap[schemaId].value = value;
-            clear(titleContainer);
-            clear(container);
-            // console.log(s.type, id, s);
-            var r = renderers[s.type];
-            if (r && !s.dependsOn) {
-                if (s.title) {
-                    renderTitle(titleContainer, s.title, s);
-                } else if (propertyProvider) {
-                    renderTitle(titleContainer, propertyProvider.getValue(), s);
-                }
-                if (!value) {
-                    if (typeof initialValue !== "undefined" && initialValue !== null) {
-                        value = getInitialValue(id);
-                    } else {
-                        value = s.default;
-                    }
-                }
-                r(container, id, parentObject, propertyProvider, value);
-            }
-        }
-
-        /**
-         * Used in object additionalProperties and arrays
-         * @param {type} getValue
-         * @param {type} onchange
-         * @returns {Object.create.createPropertyProvider.ret}
-         */
-        function createPropertyProvider(getValue, onchange) {
-            var ret = new Object();
-            ret.getValue = getValue;
-            ret.onchange = onchange;
-            return ret;
-        }
-
-        function getInitialValue(id) {
-            var ret;
-            try {
-                eval("ret = initialValue" + id.substring(1));
-            } catch (e) {
-                ret = null;
-            }
-            return ret;
-        }
-
-        function getValue(schema, input) {
-            if (typeof input.getValue === "function") {
-                return input.getValue();
-            }
-            var value;
-            if (schema.enum) {
-                value = input.options[input.selectedIndex].value;
-            } else {
-                value = input.value;
-            }
-            if (value === "") {
-                return null;
-            }
-            if (schema.type === "integer") {
-                value = parseInt(value);
-                if (!isFinite(value)) {
-                    value = null;
-                }
-            } else if (schema.type === "number") {
-                value = parseFloat(value);
-                if (!isFinite(value)) {
-                    value = null;
-                }
-            } else if (schema.type === "boolean") {
-                value = input.checked;
-                if (!value) {
-                    value = false;
-                }
-            } else if (schema.type === "any") {
-                if (value) {
-                    eval("value=" + value);
-                }
-            }
-            return value;
-        }
-
-        function getSchemaId(id) {
-            return id.replace(/\["[^"]*"\]/g, "[*]").replace(/\[\d*\]/g, "[#]");
-        }
-
-        function getSchema(schemaId) {
-            return schemaMap[schemaId];
-        }
-
-        function onDependencyChanged(name, source) {
-            function cleanSchemaMap(schemaId) {
-                for (var prop in schemaMap) {
-                    if (schemaId.startsWith(prop)) {
-                        delete schemaMap[prop];
-                    }
-                }
-            }
-            function cleanData(schemaId) {
-                var expression = new Expression(schemaId);
-                expression.visit(data, function (data, parent, property) {
-                    delete parent[property];
-                });
-            }
-            var arr = dependencyMap[name];
-            if (!arr || !obj.schemaResolver) {
-                return;
-            }
-            var cb = function (schemas) {
-                if (schemas) {
-                    for (var id in schemas) {
-                        if (JSON.stringify(schemaMap[id]) !== JSON.stringify(schemas[id])) {
-                            cleanSchemaMap(id);
-                            cleanData(id);
-                            populateSchemaMap(id, schemas[id]);
-                            var renderInfo = renderInfoMap[id];
-                            if (renderInfo) {
-                                render(renderInfo.titleContainer, renderInfo.container, id, renderInfo.parentObject, renderInfo.propertyProvider, renderInfo.value);
-                            }
-                        }
-                    }
-                }
-                BrutusinForms.onResolutionFinished(source);
-            };
-            BrutusinForms.onResolutionStarted(source);
-            obj.schemaResolver(arr, obj.getData(), cb);
-
-
-        }
-
-        function Expression(exp) {
-            if (exp === null || exp.length === 0 || exp === ".") {
-                exp = "$";
-            }
-            var queue = new Array();
-            var tokens = parseTokens(exp);
-            var isInBracket = false;
-            var numInBracket = 0;
-            var sb = "";
-            for (var i = 0; i < tokens.length; i++) {
-                var token = tokens[i];
-                if (token === "[") {
-                    if (isInBracket) {
-                        throw ("Error parsing expression '" + exp + "': Nested [ found");
-                    }
-                    isInBracket = true;
-                    numInBracket = 0;
-                    sb = sb + token;
-                } else if (token === "]") {
-                    if (!isInBracket) {
-                        throw ("Error parsing expression '" + exp + "': Unbalanced ] found");
-                    }
-                    isInBracket = false;
-                    sb = sb + token;
-                    queue[queue.length] = sb;
-                    sb = "";
-                } else {
-                    if (isInBracket) {
-                        if (numInBracket > 0) {
-                            throw ("Error parsing expression '" + exp + "': Multiple tokens found inside a bracket");
-                        }
-                        sb = sb + token;
-                        numInBracket++;
-                    } else {
-                        queue[queue.length] = token;
-                    }
-                }
-                if (i === tokens.length - 1) {
-                    if (isInBracket) {
-                        throw ("Error parsing expression '" + exp + "': Unbalanced [ found");
-                    }
-                }
-            }
-            this.exp = exp;
-            this.queue = queue;
-            this.visit = function (data, visitor) {
-                function visit(name, queue, data, parentData, property) {
-                    if (data == null) {
-                        return;
-                    }
-                    var currentToken = queue.shift();
-                    if (currentToken === "$") {
-                        name = "$";
-                        var currentToken = queue.shift();
-                    }
-                    if (!currentToken) {
-                        visitor(data, parentData, property);
-                    } else if (Array.isArray(data)) {
-                        if (!currentToken.startsWith("[")) {
-                            throw ("Node '" + name + "' is of type array");
-                        }
-                        var element = currentToken.substring(1, currentToken.length - 1);
-                        if (element.equals("#")) {
-                            for (var i = 0; i < data.length; i++) {
-                                var child = data[i];
-                                visit(name + currentToken, queue.slice(0), child, data, i);
-                                visit(name + "[" + i + "]", queue.slice(0), child, data, i);
-                            }
-                        } else if (element === "$") {
-                            var child = data[data.length - 1];
-                            visit(name + currentToken, queue.slice(0), child, data, data.length - 1);
-                        } else {
-                            var index = parseInt(element);
-                            if (isNaN(index)) {
-                                throw ("Element '" + element + "' of node '" + name + "' is not an integer, or the '$' last element symbol,  or the wilcard symbol '#'");
-                            }
-                            if (index < 0) {
-                                throw ("Element '" + element + "' of node '" + name + "' is lower than zero");
-                            }
-                            var child = data[index];
-                            visit(name + currentToken, queue.slice(0), child, data, index);
-                        }
-                    } else if ("object" === typeof data) {
-                        if (currentToken === "[*]") {
-                            for (var p in data) {
-                                var child = data[p];
-                                visit(name + currentToken, queue.slice(0), child, data, p);
-                                visit(name + "[\"" + p + "\"]", queue.slice(0), child, data, p);
-                            }
-                        } else {
-                            var child;
-                            if (currentToken.startsWith("[")) {
-                                var element = currentToken.substring(1, currentToken.length - 1);
-                                if (element.startsWith("\"") || element.startsWith("'")) {
-                                    element = element.substring(1, element.length() - 1);
-                                } else {
-                                    throw ("Element '" + element + "' of node '" + name + "' must be a string expression or wilcard '*'");
-                                }
-                                name = name + currentToken;
-                                child = data[element];
-                            } else {
-                                if (name.length > 0) {
-                                    name = name + "." + currentToken;
-                                } else {
-                                    name = currentToken;
-                                }
-                                child = data[currentToken];
-                            }
-                            visit(name, queue, child, data, currentToken);
-                        }
-                    } else if ("boolean" === typeof data
-                            || "number" === typeof data
-                            || "string" === typeof data) {
-                        throw ("Node is leaf but still are tokens remaining: " + currentToken);
-                    } else {
-                        throw ("Node type '" + typeof data + "' not supported for index field '" + name + "'");
-                    }
-                }
-                visit(this.exp, this.queue, data);
-            };
-
-            function parseTokens(exp) {
-                if (exp === null) {
-                    return null;
-                }
-                var ret = new Array();
-                var commentChar = null;
-                var start = 0;
-                for (var i = 0; i < exp.length; i++) {
-                    if (exp.charAt(i) === '"') {
-                        if (commentChar === null) {
-                            commentChar = '"';
-                        } else if (commentChar === '"') {
-                            commentChar = null;
-                            ret[ret.length] = exp.substring(start, i + 1).trim();
-                            start = i + 1;
-                        }
-                    } else if (exp.charAt(i) === '\'') {
-                        if (commentChar === null) {
-                            commentChar = '\'';
-                        } else if (commentChar === '\'') {
-                            commentChar = null;
-                            ret[ret.length] = exp.substring(start, i + 1).trim();
-                            start = i + 1;
-                        }
-                    } else if (exp.charAt(i) === '[') {
-                        if (commentChar === null) {
-                            if (start !== i) {
-                                ret[ret.length] = exp.substring(start, i).trim();
-                            }
-                            ret[ret.length] = "[";
-                            start = i + 1;
-                        }
-                    } else if (exp.charAt(i) === ']') {
-                        if (commentChar === null) {
-                            if (start !== i) {
-                                ret[ret.length] = exp.substring(start, i).trim();
-                            }
-                            ret[ret.length] = "]";
-                            start = i + 1;
-                        }
-                    } else if (exp.charAt(i) === '.') {
-                        if (commentChar === null) {
-                            if (start !== i) {
-                                ret[ret.length] = exp.substring(start, i).trim();
-                            }
-                            start = i + 1;
-                        }
-                    } else if (i === exp.length - 1) {
-                        ret[ret.length] = exp.substring(start, i + 1).trim();
-                    }
-                }
-                return ret;
-            }
-        }
-    }
-    brutusin["json-forms"] = BrutusinForms;
-}());
+/*
+ * Copyright 2015 brutusin.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "SuperLicense");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Ignacio del Valle Alles idelvall@brutusin.org
+ */
+
+
+
+
+if (typeof brutusin === "undefined") {
+    window.brutusin = new Object();
+}
+else if (!global) {
+    global = {};
+}
+else if (typeof global.brutusin !== "object") {
+    global.brutusin = new Object();
+}
+else if (typeof brutusin !== "object") {
+    throw ("brutusin global variable already exists");
+}
+
+(function () {
+
+    // shims
+    if (!String.prototype.startsWith) {
+        String.prototype.startsWith = function (searchString, position) {
+            position = position || 0;
+            return this.indexOf(searchString, position) === position;
+        };
+    }
+    if (!String.prototype.endsWith) {
+        String.prototype.endsWith = function (searchString, position) {
+            var subjectString = this.toString();
+            if (position === undefined || position > subjectString.length) {
+                position = subjectString.length;
+            }
+            position -= searchString.length;
+            var lastIndex = subjectString.indexOf(searchString, position);
+            return lastIndex !== -1 && lastIndex === position;
+        };
+    }
+    if (!String.prototype.includes) {
+        String.prototype.includes = function () {
+            'use strict';
+            return String.prototype.indexOf.apply(this, arguments) !== -1;
+        };
+    }
+    if (!String.prototype.format) {
+        String.prototype.format = function () {
+            var formatted = this;
+            for (var i = 0; i < arguments.length; i++) {
+                var regexp = new RegExp('\\{' + i + '\\}', 'gi');
+                formatted = formatted.replace(regexp, arguments[i]);
+            }
+            return formatted;
+        };
+    }
+
+    var BrutusinForms = new Object();
+    BrutusinForms.messages = {
+        "validationError": "Validation error",
+        "required": "This field is **required**",
+        "invalidValue": "Invalid field value",
+        "addpropNameExistent": "This property is already present in the object",
+        "addpropNameRequired": "A name is required",
+        "minItems": "At least `{0}` items are required",
+        "maxItems": "At most `{0}` items are allowed",
+        "pattern": "Value does not match pattern: `{0}`",
+        "minLength": "Value must be **at least** `{0}` characters long",
+        "maxLength": "Value must be **at most** `{0}` characters long",
+        "multipleOf": "Value must be **multiple of** `{0}`",
+        "minimum": "Value must be **greater or equal than** `{0}`",
+        "exclusiveMinimum": "Value must be **greater than** `{0}`",
+        "maximum": "Value must be **lower or equal than** `{0}`",
+        "exclusiveMaximum": "Value must be **lower than** `{0}`",
+        "minProperties": "At least `{0}` properties are required",
+        "maxProperties": "At most `{0}` properties are allowed"
+    };
+
+    /**
+     * Callback functions to be notified after an HTML element has been rendered (passed as parameter).
+     * @type type
+     */
+    BrutusinForms.decorators = new Array();
+
+    BrutusinForms.addDecorator = function (f) {
+        BrutusinForms.decorators[BrutusinForms.decorators.length] = f;
+    };
+
+    BrutusinForms.onResolutionStarted = function (element) {
+    };
+
+    BrutusinForms.onResolutionFinished = function (element) {
+    };
+
+    BrutusinForms.onValidationError = function (element, message) {
+        element.focus();
+        if (!element.className.includes(" error")) {
+            element.className += " error";
+        }
+        alert(message);
+    };
+
+    BrutusinForms.onValidationSuccess = function (element) {
+        element.className = element.className.replace(" error", "");
+    };
+
+    /**
+     * Callback function to be notified after a form has been rendered (passed as parameter).
+     * @type type
+     */
+    BrutusinForms.postRender = null;
+    /**
+     * BrutusinForms instances created in the document
+     * @type Array
+     */
+    BrutusinForms.instances = new Array();
+    /**
+     * BrutusinForms factory method
+     * @param {type} schema schema object
+     * @returns {BrutusinForms.create.obj|Object|Object.create.obj}
+     */
+    BrutusinForms.create = function (schema) {
+        var SCHEMA_ANY = {"type": "any"};
+        var obj = new Object();
+
+        var schemaMap = new Object();
+        var dependencyMap = new Object();
+        var renderInfoMap = new Object();
+        var container;
+        var data;
+        var error;
+        var initialValue;
+        var inputCounter = 0;
+        var formId = "BrutusinForms#" + BrutusinForms.instances.length;
+        populateSchemaMap("$", schema);
+
+        validateDepencyMapIsAcyclic();
+
+        var renderers = new Object();
+
+        renderers["integer"] = function (container, id, parentObject, propertyProvider, value) {
+            renderers["string"](container, id, parentObject, propertyProvider, value);
+        };
+
+        renderers["number"] = function (container, id, parentObject, propertyProvider, value) {
+            renderers["string"](container, id, parentObject, propertyProvider, value);
+        };
+
+        renderers["any"] = function (container, id, parentObject, propertyProvider, value) {
+            renderers["string"](container, id, parentObject, propertyProvider, value);
+        };
+
+        renderers["string"] = function (container, id, parentObject, propertyProvider, value) {
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            var input;
+            if (s.type === "any") {
+                input = document.createElement("textarea");
+                if (value) {
+                    input.value = JSON.stringify(value, null, 4);
+                }
+            } else if (s.enum) {
+                input = document.createElement("select");
+                if (!s.required) {
+                    var option = document.createElement("option");
+                    var textNode = document.createTextNode("");
+                    option.value = "";
+                    appendChild(option, textNode, s);
+                    appendChild(input, option, s);
+                }
+                var selectedIndex = 0;
+                for (var i = 0; i < s.enum.length; i++) {
+                    var option = document.createElement("option");
+                    var textNode = document.createTextNode(s.enum[i]);
+                    option.value = s.enum[i];
+                    appendChild(option, textNode, s);
+                    appendChild(input, option, s);
+                    if (value && s.enum[i] === value) {
+                        selectedIndex = i;
+                        if (!s.required) {
+                            selectedIndex++;
+                        }
+                    }
+                }
+                input.selectedIndex = selectedIndex;
+            } else {
+                input = document.createElement("input");
+                if (s.type === "integer" || s.type === "number") {
+                    input.type = "number";
+                    input.step = "any";
+                    if (typeof value !== "number") {
+                        value = null;
+                    }
+                } else if (s.format === "date-time") {
+                    input.type = "datetime-local";
+                } else if (s.format === "email") {
+                    input.type = "email";
+                } else if (s.format === "text") {
+                    input = document.createElement("textarea");
+                } else {
+                    input.type = "text";
+                }
+                if (value !== null && typeof value !== "undefined") {
+                    input.value = value;
+                }
+            }
+            input.schema = schemaId;
+            input.setAttribute("autocorrect", "off");
+
+            input.getValidationError = function () {
+                try {
+                    var value = getValue(s, input);
+                    if (value === null) {
+                        if (s.required) {
+                            return BrutusinForms.messages["required"];
+                        }
+                    } else {
+                        if (s.pattern && !s.pattern.test(value)) {
+                            return BrutusinForms.messages["pattern"].format(s.pattern.source);
+                        }
+                        if (s.minLength) {
+                            if (!value || s.minLength > value.length) {
+                                return BrutusinForms.messages["minLength"].format(s.minLength);
+                            }
+                        }
+                        if (s.maxLength) {
+                            if (value && s.maxLength < value.length) {
+                                return BrutusinForms.messages["maxLength"].format(s.maxLength);
+                            }
+                        }
+                    }
+                    if (value !== null && !isNaN(value)) {
+                        if (s.multipleOf && value % s.multipleOf !== 0) {
+                            return BrutusinForms.messages["multipleOf"].format(s.multipleOf);
+                        }
+                        if (s.hasOwnProperty("maximum")) {
+                            if (s.exclusiveMaximum && value >= s.maximum) {
+                                return BrutusinForms.messages["exclusiveMaximum"].format(s.maximum);
+                            } else if (!s.exclusiveMaximum && value > s.maximum) {
+                                return BrutusinForms.messages["maximum"].format(s.maximum);
+                            }
+                        }
+                        if (s.hasOwnProperty("minimum")) {
+                            if (s.exclusiveMinimum && value <= s.minimum) {
+                                return BrutusinForms.messages["exclusiveMinimum"].format(s.minimum);
+                            } else if (!s.exclusiveMinimum && value < s.minimum) {
+                                return BrutusinForms.messages["minimum"].format(s.minimum);
+                            }
+                        }
+                    }
+                } catch (error) {
+                    return BrutusinForms.messages["invalidValue"];
+                }
+            };
+
+            input.onchange = function () {
+                var value;
+                try {
+                    value = getValue(s, input);
+                } catch (error) {
+                    value = null;
+                }
+                if (parentObject) {
+                    parentObject[propertyProvider.getValue()] = value;
+                } else {
+                    data = value;
+                }
+                onDependencyChanged(schemaId, input);
+            };
+
+            if (s.description) {
+                input.title = s.description;
+                input.placeholder = s.description;
+            }
+//        if (s.pattern) {
+//            input.pattern = s.pattern;
+//        }
+//        if (s.required) {
+//            input.required = true;
+//        }
+//
+//        if (s.minimum) {
+//            input.min = s.minimum;
+//        }
+//        if (s.maximum) {
+//            input.max = s.maximum;
+//        }
+            input.onchange();
+            input.id = getInputId();
+            inputCounter++;
+            appendChild(container, input, s);
+            return parentObject;
+        };
+
+        renderers["boolean"] = function (container, id, parentObject, propertyProvider, value) {
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            var input = document.createElement("input");
+            input.type = "checkbox";
+            input.schema = schemaId;
+            input.onchange = function () {
+                if (parentObject) {
+                    parentObject[propertyProvider.getValue()] = getValue(s, input);
+                } else {
+                    data = getValue(s, input);
+                }
+                onDependencyChanged(schemaId, input);
+            };
+            if (value === true) {
+                input.checked = true;
+            }
+            input.id = getInputId();
+            inputCounter++;
+            if (s.description) {
+                input.title = s.description;
+            }
+            input.onchange();
+            appendChild(container, input, s);
+        };
+
+        renderers["oneOf"] = function (container, id, parentObject, propertyProvider, value) {
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            var input = document.createElement("select");
+            var display = document.createElement("div");
+            display.innerHTML = "";
+            input.type = "select";
+            input.schema = schemaId;
+            var noption = document.createElement("option");
+            noption.value = null;
+            appendChild(input, noption, s);
+            for (var i = 0; i < s.oneOf.length; i++) {
+                var option = document.createElement("option");
+                var propId = id + "." + i;
+                var ss = getSchema(propId);
+                var textNode = document.createTextNode(ss.title);
+                option.value = s.oneOf[i];
+                appendChild(option, textNode, s);
+                appendChild(input, option, s);
+            }
+            input.onchange = function () {
+                render(null, display, id + "." + (input.selectedIndex - 1), parentObject, propertyProvider, value);
+            };
+            appendChild(container, input, s);
+            appendChild(container, display, s);
+        };
+
+        renderers["object"] = function (container, id, parentObject, propertyProvider, value) {
+
+            function createStaticPropertyProvider(propname) {
+                var ret = new Object();
+                ret.getValue = function () {
+                    return propname;
+                };
+                ret.onchange = function (oldName) {
+                };
+                return ret;
+            }
+
+            function addAdditionalProperty(current, table, id, name, value) {
+                var schemaId = getSchemaId(id);
+                var s = getSchema(schemaId);
+                var tbody = table.tBodies[0];
+                var tr = document.createElement("tr");
+                var td1 = document.createElement("td");
+                td1.className = "add-prop-name";
+                var innerTab = document.createElement("table");
+                var innerTr = document.createElement("tr");
+                var innerTd1 = document.createElement("td");
+                var innerTd2 = document.createElement("td");
+                var keyForBlank = "$" + Object.keys(current).length + "$";
+                var td2 = document.createElement("td");
+                td2.className = "prop-value";
+                var nameInput = document.createElement("input");
+                nameInput.type = "text";
+                nameInput.getValidationError = function () {
+                    if (nameInput.previousValue !== nameInput.value) {
+                        if (current.hasOwnProperty(nameInput.value)) {
+                            return BrutusinForms.messages["addpropNameExistent"];
+                        }
+                    }
+                    if (!nameInput.value) {
+                        return BrutusinForms.messages["addpropNameRequired"];
+                    }
+                };
+                var pp = createPropertyProvider(
+                        function () {
+                            if (nameInput.value) {
+                                return nameInput.value;
+                            } else {
+                                return keyForBlank;
+                            }
+                        },
+                        function (oldPropertyName) {
+                            if (pp.getValue() === oldPropertyName) {
+                                return;
+                            }
+                            if (!oldPropertyName) {
+                                oldPropertyName = keyForBlank;
+                            }
+                            if (oldPropertyName && current.hasOwnProperty(oldPropertyName)) {
+                                current[pp.getValue()] = current[oldPropertyName];
+                                delete current[oldPropertyName];
+                            }
+                        });
+
+                nameInput.onblur = function () {
+                    if (nameInput.previousValue !== nameInput.value) {
+                        var name = nameInput.value;
+                        var i = 1;
+                        while (nameInput.previousValue !== name && current.hasOwnProperty(name)) {
+                            name = nameInput.value + "(" + i + ")";
+                            i++;
+                        }
+                        nameInput.value = name;
+                        pp.onchange(nameInput.previousValue);
+                        nameInput.previousValue = nameInput.value;
+                        return;
+                    }
+                };
+                var removeButton = document.createElement("button");
+                removeButton.setAttribute('type', 'button');
+                removeButton.className = "remove";
+                appendChild(removeButton, document.createTextNode("x"), s);
+                removeButton.onclick = function () {
+                    delete current[nameInput.value];
+                    table.deleteRow(tr.rowIndex);
+                    nameInput.value = null;
+                    pp.onchange(nameInput.previousValue);
+                };
+
+                appendChild(innerTd1, nameInput, s);
+                appendChild(innerTd2, removeButton, s);
+                appendChild(innerTr, innerTd1, s);
+                appendChild(innerTr, innerTd2, s);
+                appendChild(innerTab, innerTr, s);
+                appendChild(td1, innerTab, s);
+                appendChild(tr, td1, s);
+                appendChild(tr, td2, s);
+                appendChild(tbody, tr, s);
+                appendChild(table, tbody, s);
+                render(null, td2, id, current, pp, value);
+                if (name) {
+                    nameInput.value = name;
+                    nameInput.onblur();
+                }
+            }
+
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            var current = new Object();
+            if (!parentObject) {
+                data = current;
+            } else {
+                if (propertyProvider.getValue() || propertyProvider.getValue() === 0) {
+                    parentObject[propertyProvider.getValue()] = current;
+                }
+            }
+            var table = document.createElement("table");
+            table.className = "object";
+            var tbody = document.createElement("tbody");
+            appendChild(table, tbody, s);
+            var propNum = 0;
+            if (s.hasOwnProperty("properties")) {
+                propNum = s.properties.length;
+                for (var prop in s.properties) {
+                    var tr = document.createElement("tr");
+                    var td1 = document.createElement("td");
+                    td1.className = "prop-name";
+                    var propId = id + "." + prop;
+                    var td2 = document.createElement("td");
+                    td2.className = "prop-value";
+                    appendChild(tbody, tr, s);
+                    appendChild(tr, td1, s);
+                    appendChild(tr, td2, s);
+                    var pp = createStaticPropertyProvider(prop);
+                    var propInitialValue = null;
+                    if (value) {
+                        propInitialValue = value[prop];
+                    }
+                    render(td1, td2, propId, current, pp, propInitialValue);
+                }
+            }
+            if (s.additionalProperties) {
+                var addPropS = getSchema(s.additionalProperties);
+                var div = document.createElement("div");
+                appendChild(div, table, s);
+                var addButton = document.createElement("button");
+                addButton.setAttribute('type', 'button');
+                addButton.onclick = function () {
+                    addAdditionalProperty(current, table, id + "[*]");
+                };
+                if (s.maxProperties || s.minProperties) {
+                    addButton.getValidationError = function () {
+                        if (s.minProperties && propNum + table.rows.length < s.minProperties) {
+                            return BrutusinForms.messages["minProperties"].format(s.minProperties);
+                        }
+                        if (s.maxProperties && propNum + table.rows.length > s.maxProperties) {
+                            return BrutusinForms.messages["maxProperties"].format(s.maxProperties);
+                        }
+                    };
+                }
+                if (addPropS.description) {
+                    addButton.title = addPropS.description;
+                }
+                appendChild(addButton, document.createTextNode("Add"), s);
+                appendChild(div, addButton, s);
+                if (value) {
+                    for (var p in value) {
+                        if (s.properties.hasOwnProperty(p)) {
+                            continue;
+                        }
+                        addAdditionalProperty(current, table, id + "[\"" + prop + "\"]", p, value[p]);
+                    }
+                }
+                appendChild(container, div, s);
+            } else {
+                appendChild(container, table, s);
+            }
+        };
+        // end of object renderer
+        renderers["array"] = function (container, id, parentObject, propertyProvider, value) {
+            function addItem(current, table, id, value) {
+                var schemaId = getSchemaId(id);
+                var s = getSchema(schemaId);
+                var tbody = document.createElement("tbody");
+                var tr = document.createElement("tr");
+                tr.className = "item";
+                var td1 = document.createElement("td");
+                td1.className = "item-index";
+                var td2 = document.createElement("td");
+                td2.className = "item-action";
+                var td3 = document.createElement("td");
+                td3.className = "item-value";
+                var removeButton = document.createElement("button");
+                removeButton.setAttribute('type', 'button');
+                removeButton.className = "remove";
+                appendChild(removeButton, document.createTextNode("x"), s);
+                var computRowCount = function () {
+                    for (var i = 0; i < table.rows.length; i++) {
+                        var row = table.rows[i];
+                        row.cells[0].innerHTML = i + 1;
+                    }
+                };
+                removeButton.onclick = function () {
+                    current.splice(tr.rowIndex, 1);
+                    table.deleteRow(tr.rowIndex);
+                    computRowCount();
+                };
+                appendChild(td2, removeButton, s);
+                var number = document.createTextNode(table.rows.length + 1);
+                appendChild(td1, number, s);
+                appendChild(tr, td1, s);
+                appendChild(tr, td2, s);
+                appendChild(tr, td3, s);
+                appendChild(tbody, tr, s);
+                appendChild(table, tbody, s);
+                var pp = createPropertyProvider(function () {
+                    return tr.rowIndex;
+                });
+                render(null, td3, id, current, pp, value);
+            }
+
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            var itemS = getSchema(s.items);
+            var current = new Array();
+            if (!parentObject) {
+                data = current;
+            } else {
+                if (propertyProvider.getValue() || propertyProvider.getValue() === 0) {
+                    parentObject[propertyProvider.getValue()] = current;
+                }
+            }
+            if (propertyProvider) {
+                propertyProvider.onchange = function (oldPropertyName) {
+                    delete parentObject[oldPropertyName];
+                    parentObject[propertyProvider.getValue()] = current;
+                };
+            }
+            var div = document.createElement("div");
+            var table = document.createElement("table");
+            table.className = "array";
+            appendChild(div, table, s);
+            appendChild(container, div, s);
+            var addButton = document.createElement("button");
+            addButton.setAttribute('type', 'button');
+            addButton.getValidationError = function () {
+                if (s.minItems && s.minItems > table.rows.length) {
+                    return BrutusinForms.messages["minItems"].format(s.minItems);
+                }
+                if (s.maxItems && s.maxItems < table.rows.length) {
+                    return BrutusinForms.messages["maxItems"].format(s.maxItems);
+                }
+            };
+            addButton.onclick = function () {
+                addItem(current, table, id + "[#]", null);
+            };
+            if (itemS.description) {
+                addButton.title = itemS.description;
+            }
+            appendChild(addButton, document.createTextNode("Add item"), s);
+            appendChild(div, table, s);
+            appendChild(div, addButton, s);
+            if (value && value instanceof Array) {
+                for (var i = 0; i < value.length; i++) {
+                    addItem(current, table, id + "[" + i + "]", value[i]);
+                }
+            }
+            appendChild(container, div, s);
+        };
+        // end of array render
+        /**
+         * Renders the form inside the the container, with the specified data preloaded
+         * @param {type} c container
+         * @param {type} data json data
+         * @returns {undefined}
+         */
+        obj.render = function (c, data) {
+            container = c;
+            initialValue = data;
+            var form = document.createElement("form");
+            form.className = "brutusin-form";
+            form.onsubmit = function (event) {
+                return false;
+            };
+            if (container) {
+                appendChild(container, form);
+            } else {
+                appendChild(document.body, form);
+            }
+            if (error) {
+                var errLabel = document.createElement("label");
+                var errNode = document.createTextNode(error);
+                appendChild(errLabel, errNode);
+                errLabel.className = "error-message";
+                appendChild(form, errLabel);
+            } else {
+                render(null, form, "$", null, null);
+            }
+            rendered = true;
+            if (dependencyMap.hasOwnProperty("$")) {
+                onDependencyChanged("$");
+            }
+            if (BrutusinForms.postRender) {
+                BrutusinForms.postRender(obj);
+            }
+        };
+
+        obj.getRenderingContainer = function () {
+            return container;
+        };
+
+        obj.validate = function () {
+            return validate(container);
+        };
+
+        obj.getData = function () {
+            function removeEmptiesAndNulls(object) {
+                if (object instanceof Array) {
+                    if (object.length === 0) {
+                        return null;
+                    }
+                    var clone = new Array();
+                    for (var i = 0; i < object.length; i++) {
+                        clone[i] = removeEmptiesAndNulls(object[i]);
+                    }
+                    return clone;
+                } else if (object === "") {
+                    return null;
+                } else if (object instanceof Object) {
+                    var clone = new Object();
+                    for (var prop in object) {
+                        if (prop.startsWith("$") && prop.endsWith("$")) {
+                            continue;
+                        }
+                        var value = removeEmptiesAndNulls(object[prop]);
+                        if (value !== null) {
+                            clone[prop] = value;
+                        }
+                    }
+                    return clone;
+                } else {
+                    return object;
+                }
+            }
+            if (!container) {
+                return null;
+            } else {
+                return removeEmptiesAndNulls(data);
+                ;
+            }
+        };
+
+        BrutusinForms.instances[BrutusinForms.instances.length] = obj;
+
+        return obj;
+
+        function validateDepencyMapIsAcyclic() {
+            function dfs(visitInfo, stack, id) {
+                if (stack.hasOwnProperty(id)) {
+                    error = "Schema dependency graph has cycles";
+                    return;
+                }
+                stack[id] = null;
+                if (visitInfo.hasOwnProperty(id)) {
+                    return;
+                }
+                visitInfo[id] = null;
+                var arr = dependencyMap[id];
+                if (arr) {
+                    for (var i = 0; i < arr.length; i++) {
+                        dfs(visitInfo, stack, arr[i]);
+                    }
+                }
+                delete stack[id];
+            }
+            var visitInfo = new Object();
+            for (var id in dependencyMap) {
+                if (visitInfo.hasOwnProperty(id)) {
+                    continue;
+                }
+                dfs(visitInfo, new Object(), id);
+            }
+        }
+
+        function appendChild(parent, child, schema) {
+            parent.appendChild(child);
+            for (var i = 0; i < BrutusinForms.decorators.length; i++) {
+                BrutusinForms.decorators[i](child, schema);
+            }
+        }
+
+        function createPseudoSchema(schema) {
+            var pseudoSchema = new Object();
+            for (var p in schema) {
+                if (p === "items" || p === "properties" || p === "additionalProperties") {
+                    continue;
+                }
+                if (p === "pattern") {
+                    pseudoSchema[p] = new RegExp(schema[p]);
+                } else {
+                    pseudoSchema[p] = schema[p];
+                }
+
+            }
+            return pseudoSchema;
+        }
+
+        function populateSchemaMap(name, schema) {
+            var pseudoSchema = createPseudoSchema(schema);
+            schemaMap[name] = pseudoSchema;
+            if (schema.type === "object") {
+                if (schema.properties) {
+                    pseudoSchema.properties = new Object();
+                    for (var prop in schema.properties) {
+                        var childProp = name + "." + prop;
+                        pseudoSchema.properties[prop] = childProp;
+                        populateSchemaMap(childProp, schema.properties[prop]);
+                    }
+                }
+                if (schema.additionalProperties) {
+                    var childProp = name + "[*]";
+                    pseudoSchema.additionalProperties = childProp;
+                    if (schema.additionalProperties.hasOwnProperty("type")) {
+                        populateSchemaMap(childProp, schema.additionalProperties);
+                    } else {
+                        populateSchemaMap(childProp, SCHEMA_ANY);
+                    }
+                }
+            } else if (schema.type === "array") {
+                pseudoSchema.items = name + "[#]";
+                populateSchemaMap(pseudoSchema.items, schema.items);
+            } else if (schema.hasOwnProperty("oneOf")) {
+                pseudoSchema.oneOf = new Array();
+                pseudoSchema.type = "oneOf";
+                for (var i in schema.oneOf) {
+                    // console.log(schema.oneOf[i]);
+                    var childProp = name + "." + i;
+                    pseudoSchema.oneOf[i] = childProp;
+                    populateSchemaMap(childProp, schema.oneOf[i]);
+                }
+            }
+            if (schema.hasOwnProperty("dependsOn")) {
+                if (schema.dependsOn === null) {
+                    schema.dependsOn = ["$"];
+                }
+                var arr = new Array();
+                for (var i = 0; i < schema.dependsOn.length; i++) {
+                    if (!schema.dependsOn[i]) {
+                        arr[i] = "$";
+                        // Relative cases
+                    } else if (schema.dependsOn[i].startsWith("$")) {
+                        arr[i] = schema.dependsOn[i];
+                        // Relative cases
+                    } else if (name.endsWith("]")) {
+                        arr[i] = name + "." + schema.dependsOn[i];
+                    } else {
+                        arr[i] = name.substring(0, name.lastIndexOf(".")) + "." + schema.dependsOn[i];
+                    }
+                }
+                schemaMap[name].dependsOn = arr;
+                for (var i = 0; i < arr.length; i++) {
+                    var entry = dependencyMap[arr[i]];
+                    if (!entry) {
+                        entry = new Array();
+                        dependencyMap[arr[i]] = entry;
+                    }
+                    entry[entry.length] = name;
+                }
+            }
+        }
+
+        function renderTitle(container, title, schema) {
+            if (container) {
+                if (title) {
+                    var titleLabel = document.createElement("label");
+                    if (schema.type !== "any" && schema.type !== "object" && schema.type !== "array") {
+                        titleLabel.htmlFor = getInputId();
+                    }
+                    var titleNode = document.createTextNode(title + ":");
+                    appendChild(titleLabel, titleNode, schema);
+                    if (schema.description) {
+                        titleLabel.title = schema.description;
+                    }
+                    if (schema.required) {
+                        var sup = document.createElement("sup");
+                        appendChild(sup, document.createTextNode("*"), schema);
+                        appendChild(titleLabel, sup, schema);
+                        titleLabel.className = "required";
+                    }
+                    appendChild(container, titleLabel, schema);
+                }
+            }
+        }
+
+        function getInputId() {
+            return formId + "_" + inputCounter;
+        }
+
+        function validate(element) {
+            var ret = true;
+            if (element.hasOwnProperty("getValidationError")) {
+                var error = element.getValidationError();
+                if (error) {
+                    BrutusinForms.onValidationError(element, error);
+                    ret = false;
+                } else {
+                    BrutusinForms.onValidationSuccess(element);
+                }
+            }
+            if (element.childNodes) {
+                for (var i = 0; i < element.childNodes.length; i++) {
+                    if (!validate(element.childNodes[i])) {
+                        ret = false;
+                    }
+                }
+            }
+            return ret;
+        }
+
+        function clear(container) {
+            if (container) {
+                while (container.firstChild) {
+                    container.removeChild(container.firstChild);
+                }
+            }
+        }
+
+        function render(titleContainer, container, id, parentObject, propertyProvider, value) {
+            //console.log(id);
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            renderInfoMap[schemaId] = new Object();
+            renderInfoMap[schemaId].titleContainer = titleContainer;
+            renderInfoMap[schemaId].container = container;
+            renderInfoMap[schemaId].parentObject = parentObject;
+            renderInfoMap[schemaId].propertyProvider = propertyProvider;
+            renderInfoMap[schemaId].value = value;
+            clear(titleContainer);
+            clear(container);
+            // console.log(s.type, id, s);
+            var r = renderers[s.type];
+            if (r && !s.dependsOn) {
+                if (s.title) {
+                    renderTitle(titleContainer, s.title, s);
+                } else if (propertyProvider) {
+                    renderTitle(titleContainer, propertyProvider.getValue(), s);
+                }
+                if (!value) {
+                    if (typeof initialValue !== "undefined" && initialValue !== null) {
+                        value = getInitialValue(id);
+                    } else {
+                        value = s.default;
+                    }
+                }
+                r(container, id, parentObject, propertyProvider, value);
+            }
+        }
+
+        /**
+         * Used in object additionalProperties and arrays
+         * @param {type} getValue
+         * @param {type} onchange
+         * @returns {Object.create.createPropertyProvider.ret}
+         */
+        function createPropertyProvider(getValue, onchange) {
+            var ret = new Object();
+            ret.getValue = getValue;
+            ret.onchange = onchange;
+            return ret;
+        }
+
+        function getInitialValue(id) {
+            var ret;
+            try {
+                eval("ret = initialValue" + id.substring(1));
+            } catch (e) {
+                ret = null;
+            }
+            return ret;
+        }
+
+        function getValue(schema, input) {
+            if (typeof input.getValue === "function") {
+                return input.getValue();
+            }
+            var value;
+            if (schema.enum) {
+                value = input.options[input.selectedIndex].value;
+            } else {
+                value = input.value;
+            }
+            if (value === "") {
+                return null;
+            }
+            if (schema.type === "integer") {
+                value = parseInt(value);
+                if (!isFinite(value)) {
+                    value = null;
+                }
+            } else if (schema.type === "number") {
+                value = parseFloat(value);
+                if (!isFinite(value)) {
+                    value = null;
+                }
+            } else if (schema.type === "boolean") {
+                value = input.checked;
+                if (!value) {
+                    value = false;
+                }
+            } else if (schema.type === "any") {
+                if (value) {
+                    eval("value=" + value);
+                }
+            }
+            return value;
+        }
+
+        function getSchemaId(id) {
+            return id.replace(/\["[^"]*"\]/g, "[*]").replace(/\[\d*\]/g, "[#]");
+        }
+
+        function getSchema(schemaId) {
+            return schemaMap[schemaId];
+        }
+
+        function onDependencyChanged(name, source) {
+            function cleanSchemaMap(schemaId) {
+                for (var prop in schemaMap) {
+                    if (schemaId.startsWith(prop)) {
+                        delete schemaMap[prop];
+                    }
+                }
+            }
+            function cleanData(schemaId) {
+                var expression = new Expression(schemaId);
+                expression.visit(data, function (data, parent, property) {
+                    delete parent[property];
+                });
+            }
+            var arr = dependencyMap[name];
+            if (!arr || !obj.schemaResolver) {
+                return;
+            }
+            var cb = function (schemas) {
+                if (schemas) {
+                    for (var id in schemas) {
+                        if (JSON.stringify(schemaMap[id]) !== JSON.stringify(schemas[id])) {
+                            cleanSchemaMap(id);
+                            cleanData(id);
+                            populateSchemaMap(id, schemas[id]);
+                            var renderInfo = renderInfoMap[id];
+                            if (renderInfo) {
+                                render(renderInfo.titleContainer, renderInfo.container, id, renderInfo.parentObject, renderInfo.propertyProvider, renderInfo.value);
+                            }
+                        }
+                    }
+                }
+                BrutusinForms.onResolutionFinished(source);
+            };
+            BrutusinForms.onResolutionStarted(source);
+            obj.schemaResolver(arr, obj.getData(), cb);
+
+
+        }
+
+        function Expression(exp) {
+            if (exp === null || exp.length === 0 || exp === ".") {
+                exp = "$";
+            }
+            var queue = new Array();
+            var tokens = parseTokens(exp);
+            var isInBracket = false;
+            var numInBracket = 0;
+            var sb = "";
+            for (var i = 0; i < tokens.length; i++) {
+                var token = tokens[i];
+                if (token === "[") {
+                    if (isInBracket) {
+                        throw ("Error parsing expression '" + exp + "': Nested [ found");
+                    }
+                    isInBracket = true;
+                    numInBracket = 0;
+                    sb = sb + token;
+                } else if (token === "]") {
+                    if (!isInBracket) {
+                        throw ("Error parsing expression '" + exp + "': Unbalanced ] found");
+                    }
+                    isInBracket = false;
+                    sb = sb + token;
+                    queue[queue.length] = sb;
+                    sb = "";
+                } else {
+                    if (isInBracket) {
+                        if (numInBracket > 0) {
+                            throw ("Error parsing expression '" + exp + "': Multiple tokens found inside a bracket");
+                        }
+                        sb = sb + token;
+                        numInBracket++;
+                    } else {
+                        queue[queue.length] = token;
+                    }
+                }
+                if (i === tokens.length - 1) {
+                    if (isInBracket) {
+                        throw ("Error parsing expression '" + exp + "': Unbalanced [ found");
+                    }
+                }
+            }
+            this.exp = exp;
+            this.queue = queue;
+            this.visit = function (data, visitor) {
+                function visit(name, queue, data, parentData, property) {
+                    if (data == null) {
+                        return;
+                    }
+                    var currentToken = queue.shift();
+                    if (currentToken === "$") {
+                        name = "$";
+                        var currentToken = queue.shift();
+                    }
+                    if (!currentToken) {
+                        visitor(data, parentData, property);
+                    } else if (Array.isArray(data)) {
+                        if (!currentToken.startsWith("[")) {
+                            throw ("Node '" + name + "' is of type array");
+                        }
+                        var element = currentToken.substring(1, currentToken.length - 1);
+                        if (element.equals("#")) {
+                            for (var i = 0; i < data.length; i++) {
+                                var child = data[i];
+                                visit(name + currentToken, queue.slice(0), child, data, i);
+                                visit(name + "[" + i + "]", queue.slice(0), child, data, i);
+                            }
+                        } else if (element === "$") {
+                            var child = data[data.length - 1];
+                            visit(name + currentToken, queue.slice(0), child, data, data.length - 1);
+                        } else {
+                            var index = parseInt(element);
+                            if (isNaN(index)) {
+                                throw ("Element '" + element + "' of node '" + name + "' is not an integer, or the '$' last element symbol,  or the wilcard symbol '#'");
+                            }
+                            if (index < 0) {
+                                throw ("Element '" + element + "' of node '" + name + "' is lower than zero");
+                            }
+                            var child = data[index];
+                            visit(name + currentToken, queue.slice(0), child, data, index);
+                        }
+                    } else if ("object" === typeof data) {
+                        if (currentToken === "[*]") {
+                            for (var p in data) {
+                                var child = data[p];
+                                visit(name + currentToken, queue.slice(0), child, data, p);
+                                visit(name + "[\"" + p + "\"]", queue.slice(0), child, data, p);
+                            }
+                        } else {
+                            var child;
+                            if (currentToken.startsWith("[")) {
+                                var element = currentToken.substring(1, currentToken.length - 1);
+                                if (element.startsWith("\"") || element.startsWith("'")) {
+                                    element = element.substring(1, element.length() - 1);
+                                } else {
+                                    throw ("Element '" + element + "' of node '" + name + "' must be a string expression or wilcard '*'");
+                                }
+                                name = name + currentToken;
+                                child = data[element];
+                            } else {
+                                if (name.length > 0) {
+                                    name = name + "." + currentToken;
+                                } else {
+                                    name = currentToken;
+                                }
+                                child = data[currentToken];
+                            }
+                            visit(name, queue, child, data, currentToken);
+                        }
+                    } else if ("boolean" === typeof data
+                            || "number" === typeof data
+                            || "string" === typeof data) {
+                        throw ("Node is leaf but still are tokens remaining: " + currentToken);
+                    } else {
+                        throw ("Node type '" + typeof data + "' not supported for index field '" + name + "'");
+                    }
+                }
+                visit(this.exp, this.queue, data);
+            };
+
+            function parseTokens(exp) {
+                if (exp === null) {
+                    return null;
+                }
+                var ret = new Array();
+                var commentChar = null;
+                var start = 0;
+                for (var i = 0; i < exp.length; i++) {
+                    if (exp.charAt(i) === '"') {
+                        if (commentChar === null) {
+                            commentChar = '"';
+                        } else if (commentChar === '"') {
+                            commentChar = null;
+                            ret[ret.length] = exp.substring(start, i + 1).trim();
+                            start = i + 1;
+                        }
+                    } else if (exp.charAt(i) === '\'') {
+                        if (commentChar === null) {
+                            commentChar = '\'';
+                        } else if (commentChar === '\'') {
+                            commentChar = null;
+                            ret[ret.length] = exp.substring(start, i + 1).trim();
+                            start = i + 1;
+                        }
+                    } else if (exp.charAt(i) === '[') {
+                        if (commentChar === null) {
+                            if (start !== i) {
+                                ret[ret.length] = exp.substring(start, i).trim();
+                            }
+                            ret[ret.length] = "[";
+                            start = i + 1;
+                        }
+                    } else if (exp.charAt(i) === ']') {
+                        if (commentChar === null) {
+                            if (start !== i) {
+                                ret[ret.length] = exp.substring(start, i).trim();
+                            }
+                            ret[ret.length] = "]";
+                            start = i + 1;
+                        }
+                    } else if (exp.charAt(i) === '.') {
+                        if (commentChar === null) {
+                            if (start !== i) {
+                                ret[ret.length] = exp.substring(start, i).trim();
+                            }
+                            start = i + 1;
+                        }
+                    } else if (i === exp.length - 1) {
+                        ret[ret.length] = exp.substring(start, i + 1).trim();
+                    }
+                }
+                return ret;
+            }
+        }
+    };
+    brutusin["json-forms"] = BrutusinForms;
+}());
diff --git a/src/js/json-forms-node.js b/src/js/json-forms-node.js
new file mode 100644
index 0000000..c6b309f
--- /dev/null
+++ b/src/js/json-forms-node.js
@@ -0,0 +1,1148 @@
+//TODO: remove polyfills that alter native prototypes. Performance hit.
+if (!String.prototype.startsWith) {
+    String.prototype.startsWith = function (searchString, position) {
+        position = position || 0;
+        return this.indexOf(searchString, position) === position;
+    };
+}
+if (!String.prototype.endsWith) {
+    String.prototype.endsWith = function (searchString, position) {
+        var subjectString = this.toString();
+        if (position === undefined || position > subjectString.length) {
+            position = subjectString.length;
+        }
+        position -= searchString.length;
+        var lastIndex = subjectString.indexOf(searchString, position);
+        return lastIndex !== -1 && lastIndex === position;
+    };
+}
+if (!String.prototype.includes) {
+    String.prototype.includes = function () {
+        'use strict';
+        return String.prototype.indexOf.apply(this, arguments) !== -1;
+    };
+}
+if (!String.prototype.format) {
+    String.prototype.format = function () {
+        var formatted = this;
+        for (var i = 0; i < arguments.length; i++) {
+            var regexp = new RegExp('\\{' + i + '\\}', 'gi');
+            formatted = formatted.replace(regexp, arguments[i]);
+        }
+        return formatted;
+    };
+}
+
+
+function BrutusinForms() {
+    if (!this instanceof BrutusinForms) {
+        return new BrutusinForms();
+    }
+    var self = this;
+
+    self.messages = {
+        "validationError": "Validation error",
+        "required": "This field is **required**",
+        "invalidValue": "Invalid field value",
+        "addpropNameExistent": "This property is already present in the object",
+        "addpropNameRequired": "A name is required",
+        "minItems": "At least `{0}` items are required",
+        "maxItems": "At most `{0}` items are allowed",
+        "pattern": "Value does not match pattern: `{0}`",
+        "minLength": "Value must be **at least** `{0}` characters long",
+        "maxLength": "Value must be **at most** `{0}` characters long",
+        "multipleOf": "Value must be **multiple of** `{0}`",
+        "minimum": "Value must be **greater or equal than** `{0}`",
+        "exclusiveMinimum": "Value must be **greater than** `{0}`",
+        "maximum": "Value must be **lower or equal than** `{0}`",
+        "exclusiveMaximum": "Value must be **lower than** `{0}`",
+        "minProperties": "At least `{0}` properties are required",
+        "maxProperties": "At most `{0}` properties are allowed"
+    };
+
+    var decorators = [];
+
+    self.addDecorator = function (f) {
+        decorators[decorators.length] = f;
+    };
+
+    // self.onResolutionStarted = function (element) {};
+    // self.onResolutionFinished = function (element) {};
+
+    self.onValidationError = function (element, message) {
+        element.focus();
+        if (!element.className.includes(" error")) {
+            element.className += " error";
+        }
+        console.log(message);
+    };
+
+    self.onValidationSuccess = function (element) {
+        element.className = element.className.replace(" error", "");
+    };
+
+    self.postRender = null;
+    self.instances = [];
+    /**
+     * BrutusinForms factory method
+     * @param {type} schema schema object
+     * @returns {self.create.obj|Object|Object.create.obj}
+     */
+    self.create = function (schema) {
+        var SCHEMA_ANY = {"type": "any"};
+        var obj = {};
+        var schemaMap = {};
+        var dependencyMap = {};
+        var renderInfoMap = {};
+
+        var container;
+        var data;
+        var error;
+        var initialValue;
+        var inputCounter = 0;
+        var formId = "BrutusinForms#" + self.instances.length;
+
+        //populateSchemaMap("$", schema);
+
+        validateDepencyMapIsAcyclic();
+
+        var renderers = {};
+
+        renderers["integer"] = function (container, id, parentObject, propertyProvider, value) {
+            renderers["string"](container, id, parentObject, propertyProvider, value);
+        };
+
+        renderers["number"] = function (container, id, parentObject, propertyProvider, value) {
+            renderers["string"](container, id, parentObject, propertyProvider, value);
+        };
+
+        renderers["any"] = function (container, id, parentObject, propertyProvider, value) {
+            renderers["string"](container, id, parentObject, propertyProvider, value);
+        };
+
+        renderers["string"] = function (container, id, parentObject, propertyProvider, value) {
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            var input;
+            if (s.type === "any") {
+                input = document.createElement("textarea");
+                if (value) {
+                    input.value = JSON.stringify(value, null, 4);
+                }
+            } else if (s.enum) {
+                input = document.createElement("select");
+                if (!s.required) {
+                    var option = document.createElement("option");
+                    var textNode = document.createTextNode("");
+                    option.value = "";
+                    appendChild(option, textNode, s);
+                    appendChild(input, option, s);
+                }
+                var selectedIndex = 0;
+                for (var i = 0; i < s.enum.length; i++) {
+                    var option = document.createElement("option");
+                    var textNode = document.createTextNode(s.enum[i]);
+                    option.value = s.enum[i];
+                    appendChild(option, textNode, s);
+                    appendChild(input, option, s);
+                    if (value && s.enum[i] === value) {
+                        selectedIndex = i;
+                        if (!s.required) {
+                            selectedIndex++;
+                        }
+                    }
+                }
+                input.selectedIndex = selectedIndex;
+            } else {
+                input = document.createElement("input");
+                if (s.type === "integer" || s.type === "number") {
+                    input.type = "number";
+                    input.step = "any";
+                    if (typeof value !== "number") {
+                        value = null;
+                    }
+                } else if (s.format === "date-time") {
+                    input.type = "datetime-local";
+                } else if (s.format === "email") {
+                    input.type = "email";
+                } else if (s.format === "text") {
+                    input = document.createElement("textarea");
+                } else {
+                    input.type = "text";
+                }
+                if (value !== null && typeof value !== "undefined") {
+                    input.value = value;
+                }
+            }
+            input.schema = schemaId;
+            input.setAttribute("autocorrect", "off");
+
+            input.getValidationError = function () {
+                try {
+                    var value = getValue(s, input);
+                    if (value === null) {
+                        if (s.required) {
+                            return self.messages["required"];
+                        }
+                    } else {
+                        if (s.pattern && !s.pattern.test(value)) {
+                            return self.messages["pattern"].format(s.pattern.source);
+                        }
+                        if (s.minLength) {
+                            if (!value || s.minLength > value.length) {
+                                return self.messages["minLength"].format(s.minLength);
+                            }
+                        }
+                        if (s.maxLength) {
+                            if (value && s.maxLength < value.length) {
+                                return self.messages["maxLength"].format(s.maxLength);
+                            }
+                        }
+                    }
+                    if (value !== null && !isNaN(value)) {
+                        if (s.multipleOf && value % s.multipleOf !== 0) {
+                            return self.messages["multipleOf"].format(s.multipleOf);
+                        }
+                        if (s.hasOwnProperty("maximum")) {
+                            if (s.exclusiveMaximum && value >= s.maximum) {
+                                return self.messages["exclusiveMaximum"].format(s.maximum);
+                            } else if (!s.exclusiveMaximum && value > s.maximum) {
+                                return self.messages["maximum"].format(s.maximum);
+                            }
+                        }
+                        if (s.hasOwnProperty("minimum")) {
+                            if (s.exclusiveMinimum && value <= s.minimum) {
+                                return self.messages["exclusiveMinimum"].format(s.minimum);
+                            } else if (!s.exclusiveMinimum && value < s.minimum) {
+                                return self.messages["minimum"].format(s.minimum);
+                            }
+                        }
+                    }
+                } catch (error) {
+                    return self.messages["invalidValue"];
+                }
+            };
+
+            input.onchange = function () {
+                var value;
+                try {
+                    value = getValue(s, input);
+                } catch (error) {
+                    value = null;
+                }
+                if (parentObject) {
+                    parentObject[propertyProvider.getValue()] = value;
+                } else {
+                    data = value;
+                }
+                onDependencyChanged(schemaId, input);
+            };
+
+            if (s.description) {
+                input.title = s.description;
+                input.placeholder = s.description;
+            }
+            input.onchange();
+            input.id = getInputId();
+            inputCounter++;
+            appendChild(container, input, s);
+            return parentObject;
+        };
+
+        renderers["boolean"] = function (container, id, parentObject, propertyProvider, value) {
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            var input = document.createElement("input");
+            input.type = "checkbox";
+            input.schema = schemaId;
+            input.onchange = function () {
+                if (parentObject) {
+                    parentObject[propertyProvider.getValue()] = getValue(s, input);
+                } else {
+                    data = getValue(s, input);
+                }
+                onDependencyChanged(schemaId, input);
+            };
+            if (value === true) {
+                input.checked = true;
+            }
+            input.id = getInputId();
+            inputCounter++;
+            if (s.description) {
+                input.title = s.description;
+            }
+            input.onchange();
+            appendChild(container, input, s);
+        };
+
+        renderers["oneOf"] = function (container, id, parentObject, propertyProvider, value) {
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            var input = document.createElement("select");
+            var display = document.createElement("div");
+            display.innerHTML = "";
+            input.type = "select";
+            input.schema = schemaId;
+            var noption = document.createElement("option");
+            noption.value = null;
+            appendChild(input, noption, s);
+            for (var i = 0; i < s.oneOf.length; i++) {
+                var option = document.createElement("option");
+                var propId = id + "." + i;
+                var ss = getSchema(propId);
+                var textNode = document.createTextNode(ss.title);
+                option.value = s.oneOf[i];
+                appendChild(option, textNode, s);
+                appendChild(input, option, s);
+            }
+            input.onchange = function () {
+                render(null, display, id + "." + (input.selectedIndex - 1), parentObject, propertyProvider, value);
+            };
+            appendChild(container, input, s);
+            appendChild(container, display, s);
+        };
+
+        renderers["object"] = function (container, id, parentObject, propertyProvider, value) {
+
+            function createStaticPropertyProvider(propname) {
+                var ret = {};
+                ret.getValue = function () {
+                    return propname;
+                };
+                ret.onchange = function (oldName) {
+                };
+                return ret;
+            }
+
+            function addAdditionalProperty(current, table, id, name, value) {
+                var schemaId = getSchemaId(id);
+                var s = getSchema(schemaId);
+                var tbody = table.tBodies[0];
+                var tr = document.createElement("tr");
+                var td1 = document.createElement("td");
+                td1.className = "add-prop-name";
+                var innerTab = document.createElement("table");
+                var innerTr = document.createElement("tr");
+                var innerTd1 = document.createElement("td");
+                var innerTd2 = document.createElement("td");
+                var keyForBlank = "$" + Object.keys(current).length + "$";
+                var td2 = document.createElement("td");
+                td2.className = "prop-value";
+                var nameInput = document.createElement("input");
+                nameInput.type = "text";
+                nameInput.getValidationError = function () {
+                    if (nameInput.previousValue !== nameInput.value) {
+                        if (current.hasOwnProperty(nameInput.value)) {
+                            return self.messages["addpropNameExistent"];
+                        }
+                    }
+                    if (!nameInput.value) {
+                        return self.messages["addpropNameRequired"];
+                    }
+                };
+                var pp = createPropertyProvider(
+                    function () {
+                        if (nameInput.value) {
+                            return nameInput.value;
+                        } else {
+                            return keyForBlank;
+                        }
+                    },
+                    function (oldPropertyName) {
+                        if (pp.getValue() === oldPropertyName) {
+                            return;
+                        }
+                        if (!oldPropertyName) {
+                            oldPropertyName = keyForBlank;
+                        }
+                        if (oldPropertyName && current.hasOwnProperty(oldPropertyName)) {
+                            current[pp.getValue()] = current[oldPropertyName];
+                            delete current[oldPropertyName];
+                        }
+                    });
+
+                nameInput.onblur = function () {
+                    if (nameInput.previousValue !== nameInput.value) {
+                        var name = nameInput.value;
+                        var i = 1;
+                        while (nameInput.previousValue !== name && current.hasOwnProperty(name)) {
+                            name = nameInput.value + "(" + i + ")";
+                            i++;
+                        }
+                        nameInput.value = name;
+                        pp.onchange(nameInput.previousValue);
+                        nameInput.previousValue = nameInput.value;
+                        return;
+                    }
+                };
+                var removeButton = document.createElement("button");
+                removeButton.setAttribute('type', 'button');
+                removeButton.className = "remove";
+                appendChild(removeButton, document.createTextNode("x"), s);
+                removeButton.onclick = function () {
+                    delete current[nameInput.value];
+                    table.deleteRow(tr.rowIndex);
+                    nameInput.value = null;
+                    pp.onchange(nameInput.previousValue);
+                };
+
+                appendChild(innerTd1, nameInput, s);
+                appendChild(innerTd2, removeButton, s);
+                appendChild(innerTr, innerTd1, s);
+                appendChild(innerTr, innerTd2, s);
+                appendChild(innerTab, innerTr, s);
+                appendChild(td1, innerTab, s);
+                appendChild(tr, td1, s);
+                appendChild(tr, td2, s);
+                appendChild(tbody, tr, s);
+                appendChild(table, tbody, s);
+                render(null, td2, id, current, pp, value);
+                if (name) {
+                    nameInput.value = name;
+                    nameInput.onblur();
+                }
+            }
+
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            var current = {};
+            if (!parentObject) {
+                data = current;
+            } else {
+                if (propertyProvider.getValue() || propertyProvider.getValue() === 0) {
+                    parentObject[propertyProvider.getValue()] = current;
+                }
+            }
+            var table = document.createElement("table");
+            table.className = "object";
+            var tbody = document.createElement("tbody");
+            appendChild(table, tbody, s);
+            var propNum = 0;
+            if (s.hasOwnProperty("properties")) {
+                propNum = s.properties.length;
+                for (var prop in s.properties) {
+                    var tr = document.createElement("tr");
+                    var td1 = document.createElement("td");
+                    td1.className = "prop-name";
+                    var propId = id + "." + prop;
+                    var td2 = document.createElement("td");
+                    td2.className = "prop-value";
+                    appendChild(tbody, tr, s);
+                    appendChild(tr, td1, s);
+                    appendChild(tr, td2, s);
+                    var pp = createStaticPropertyProvider(prop);
+                    var propInitialValue = null;
+                    if (value) {
+                        propInitialValue = value[prop];
+                    }
+                    render(td1, td2, propId, current, pp, propInitialValue);
+                }
+            }
+            if (s.additionalProperties) {
+                var addPropS = getSchema(s.additionalProperties);
+                var div = document.createElement("div");
+                appendChild(div, table, s);
+                var addButton = document.createElement("button");
+                addButton.setAttribute('type', 'button');
+                addButton.onclick = function () {
+                    addAdditionalProperty(current, table, id + "[*]");
+                };
+                if (s.maxProperties || s.minProperties) {
+                    addButton.getValidationError = function () {
+                        if (s.minProperties && propNum + table.rows.length < s.minProperties) {
+                            return self.messages["minProperties"].format(s.minProperties);
+                        }
+                        if (s.maxProperties && propNum + table.rows.length > s.maxProperties) {
+                            return self.messages["maxProperties"].format(s.maxProperties);
+                        }
+                    };
+                }
+                if (addPropS.description) {
+                    addButton.title = addPropS.description;
+                }
+                appendChild(addButton, document.createTextNode("Add"), s);
+                appendChild(div, addButton, s);
+                if (value) {
+                    for (var p in value) {
+                        if (s.properties.hasOwnProperty(p)) {
+                            continue;
+                        }
+                        addAdditionalProperty(current, table, id + "[\"" + prop + "\"]", p, value[p]);
+                    }
+                }
+                appendChild(container, div, s);
+            } else {
+                appendChild(container, table, s);
+            }
+        };
+        // end of object renderer
+        renderers["array"] = function (container, id, parentObject, propertyProvider, value) {
+            function addItem(current, table, id, value) {
+                var schemaId = getSchemaId(id);
+                var s = getSchema(schemaId);
+                var tbody = document.createElement("tbody");
+                var tr = document.createElement("tr");
+                tr.className = "item";
+                var td1 = document.createElement("td");
+                td1.className = "item-index";
+                var td2 = document.createElement("td");
+                td2.className = "item-action";
+                var td3 = document.createElement("td");
+                td3.className = "item-value";
+                var removeButton = document.createElement("button");
+                removeButton.setAttribute('type', 'button');
+                removeButton.className = "remove";
+                appendChild(removeButton, document.createTextNode("x"), s);
+                var computRowCount = function () {
+                    for (var i = 0; i < table.rows.length; i++) {
+                        var row = table.rows[i];
+                        row.cells[0].innerHTML = i + 1;
+                    }
+                };
+                removeButton.onclick = function () {
+                    current.splice(tr.rowIndex, 1);
+                    table.deleteRow(tr.rowIndex);
+                    computRowCount();
+                };
+                appendChild(td2, removeButton, s);
+                var number = document.createTextNode(table.rows.length + 1);
+                appendChild(td1, number, s);
+                appendChild(tr, td1, s);
+                appendChild(tr, td2, s);
+                appendChild(tr, td3, s);
+                appendChild(tbody, tr, s);
+                appendChild(table, tbody, s);
+                var pp = createPropertyProvider(function () {
+                    return tr.rowIndex;
+                });
+                render(null, td3, id, current, pp, value);
+            }
+
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            var itemS = getSchema(s.items);
+            var current = [];
+            if (!parentObject) {
+                data = current;
+            } else {
+                if (propertyProvider.getValue() || propertyProvider.getValue() === 0) {
+                    parentObject[propertyProvider.getValue()] = current;
+                }
+            }
+            if (propertyProvider) {
+                propertyProvider.onchange = function (oldPropertyName) {
+                    delete parentObject[oldPropertyName];
+                    parentObject[propertyProvider.getValue()] = current;
+                };
+            }
+            var div = document.createElement("div");
+            var table = document.createElement("table");
+            table.className = "array";
+            appendChild(div, table, s);
+            appendChild(container, div, s);
+            var addButton = document.createElement("button");
+            addButton.setAttribute('type', 'button');
+            addButton.getValidationError = function () {
+                if (s.minItems && s.minItems > table.rows.length) {
+                    return self.messages["minItems"].format(s.minItems);
+                }
+                if (s.maxItems && s.maxItems < table.rows.length) {
+                    return self.messages["maxItems"].format(s.maxItems);
+                }
+            };
+            addButton.onclick = function () {
+                addItem(current, table, id + "[#]", null);
+            };
+            if (itemS.description) {
+                addButton.title = itemS.description;
+            }
+            appendChild(addButton, document.createTextNode("Add item"), s);
+            appendChild(div, table, s);
+            appendChild(div, addButton, s);
+            if (value && value instanceof Array) {
+                for (var i = 0; i < value.length; i++) {
+                    addItem(current, table, id + "[" + i + "]", value[i]);
+                }
+            }
+            appendChild(container, div, s);
+        };
+        // end of array render
+        /**
+         * Renders the form inside the the container, with the specified data preloaded
+         * @param {type} c container
+         * @param {type} data json data
+         * @returns {undefined}
+         */
+        obj.render = function (c, data) {
+            container = c;
+            initialValue = data;
+            var form = document.createElement("form");
+            form.className = "brutusin-form";
+            form.onsubmit = function (event) {
+                return false;
+            };
+            if (container) {
+                appendChild(container, form);
+            } else {
+                appendChild(document.body, form);
+            }
+            if (error) {
+                var errLabel = document.createElement("label");
+                var errNode = document.createTextNode(error);
+                appendChild(errLabel, errNode);
+                errLabel.className = "error-message";
+                appendChild(form, errLabel);
+            } else {
+                render(null, form, "$", null, null);
+            }
+            rendered = true;
+            if (dependencyMap.hasOwnProperty("$")) {
+                onDependencyChanged("$");
+            }
+            if (self.postRender) {
+                self.postRender(obj);
+            }
+        };
+
+        obj.getRenderingContainer = function () {
+            return container;
+        };
+
+        obj.validate = function () {
+            return validate(container);
+        };
+
+        obj.getData = function () {
+            function removeEmptiesAndNulls(object) {
+                if (object instanceof Array) {
+                    if (object.length === 0) {
+                        return null;
+                    }
+                    var clone = [];
+                    for (var i = 0; i < object.length; i++) {
+                        clone[i] = removeEmptiesAndNulls(object[i]);
+                    }
+                    return clone;
+                } else if (object === "") {
+                    return null;
+                } else if (object instanceof Object) {
+                    var clone = {};
+                    for (var prop in object) {
+                        if (prop.startsWith("$") && prop.endsWith("$")) {
+                            continue;
+                        }
+                        var value = removeEmptiesAndNulls(object[prop]);
+                        if (value !== null) {
+                            clone[prop] = value;
+                        }
+                    }
+                    return clone;
+                } else {
+                    return object;
+                }
+            }
+
+            if (!container) {
+                return null;
+            } else {
+                return removeEmptiesAndNulls(data);
+            }
+        };
+
+        self.instances[self.instances.length] = obj;
+
+        return obj;
+
+        function validateDepencyMapIsAcyclic() {
+            function dfs(visitInfo, stack, id) {
+                if (stack.hasOwnProperty(id)) {
+                    error = "Schema dependency graph has cycles";
+                    return;
+                }
+                stack[id] = null;
+                if (visitInfo.hasOwnProperty(id)) {
+                    return;
+                }
+                visitInfo[id] = null;
+                var arr = dependencyMap[id];
+                if (arr) {
+                    for (var i = 0; i < arr.length; i++) {
+                        dfs(visitInfo, stack, arr[i]);
+                    }
+                }
+                delete stack[id];
+            }
+
+            var visitInfo = {};
+            for (var id in dependencyMap) {
+                if (visitInfo.hasOwnProperty(id)) {
+                    continue;
+                }
+                dfs(visitInfo, {}, id);
+            }
+        }
+
+        function appendChild(parent, child, schema) {
+            parent.appendChild(child);
+            for (var i = 0; i < self.decorators.length; i++) {
+                self.decorators[i](child, schema);
+            }
+        }
+
+        function createPseudoSchema(schema) {
+            var pseudoSchema = {};
+            for (var p in schema) {
+                if (p === "items" || p === "properties" || p === "additionalProperties") {
+                    continue;
+                }
+                if (p === "pattern") {
+                    pseudoSchema[p] = new RegExp(schema[p]);
+                } else {
+                    pseudoSchema[p] = schema[p];
+                }
+
+            }
+            return pseudoSchema;
+        }
+
+        function populateSchemaMap(name, schema) {
+            var pseudoSchema = createPseudoSchema(schema);
+            schemaMap[name] = pseudoSchema;
+            if (schema.type === "object") {
+                if (schema.properties) {
+                    pseudoSchema.properties = {};
+                    for (var prop in schema.properties) {
+                        var childProp = name + "." + prop;
+                        pseudoSchema.properties[prop] = childProp;
+                        populateSchemaMap(childProp, schema.properties[prop]);
+                    }
+                }
+                if (schema.additionalProperties) {
+                    var childProp = name + "[*]";
+                    pseudoSchema.additionalProperties = childProp;
+                    if (schema.additionalProperties.hasOwnProperty("type")) {
+                        populateSchemaMap(childProp, schema.additionalProperties);
+                    } else {
+                        populateSchemaMap(childProp, SCHEMA_ANY);
+                    }
+                }
+            } else if (schema.type === "array") {
+                pseudoSchema.items = name + "[#]";
+                populateSchemaMap(pseudoSchema.items, schema.items);
+            } else if (schema.hasOwnProperty("oneOf")) {
+                pseudoSchema.oneOf = [];
+                pseudoSchema.type = "oneOf";
+                for (var i in schema.oneOf) {
+                    // console.log(schema.oneOf[i]);
+                    var childProp = name + "." + i;
+                    pseudoSchema.oneOf[i] = childProp;
+                    populateSchemaMap(childProp, schema.oneOf[i]);
+                }
+            }
+            if (schema.hasOwnProperty("dependsOn")) {
+                if (schema.dependsOn === null) {
+                    schema.dependsOn = ["$"];
+                }
+                var arr = [];
+                for (var i = 0; i < schema.dependsOn.length; i++) {
+                    if (!schema.dependsOn[i]) {
+                        arr[i] = "$";
+                        // Relative cases
+                    } else if (schema.dependsOn[i].startsWith("$")) {
+                        arr[i] = schema.dependsOn[i];
+                        // Relative cases
+                    } else if (name.endsWith("]")) {
+                        arr[i] = name + "." + schema.dependsOn[i];
+                    } else {
+                        arr[i] = name.substring(0, name.lastIndexOf(".")) + "." + schema.dependsOn[i];
+                    }
+                }
+                schemaMap[name].dependsOn = arr;
+                for (var i = 0; i < arr.length; i++) {
+                    var entry = dependencyMap[arr[i]];
+                    if (!entry) {
+                        entry = [];
+                        dependencyMap[arr[i]] = entry;
+                    }
+                    entry[entry.length] = name;
+                }
+            }
+        }
+
+        function renderTitle(container, title, schema) {
+            if (container) {
+                if (title) {
+                    var titleLabel = document.createElement("label");
+                    if (schema.type !== "any" && schema.type !== "object" && schema.type !== "array") {
+                        titleLabel.htmlFor = getInputId();
+                    }
+                    var titleNode = document.createTextNode(title + ":");
+                    appendChild(titleLabel, titleNode, schema);
+                    if (schema.description) {
+                        titleLabel.title = schema.description;
+                    }
+                    if (schema.required) {
+                        var sup = document.createElement("sup");
+                        appendChild(sup, document.createTextNode("*"), schema);
+                        appendChild(titleLabel, sup, schema);
+                        titleLabel.className = "required";
+                    }
+                    appendChild(container, titleLabel, schema);
+                }
+            }
+        }
+
+        function getInputId() {
+            return formId + "_" + inputCounter;
+        }
+
+        function validate(element) {
+            var ret = true;
+            if (element.hasOwnProperty("getValidationError")) {
+                var error = element.getValidationError();
+                if (error) {
+                    self.onValidationError(element, error);
+                    ret = false;
+                } else {
+                    self.onValidationSuccess(element);
+                }
+            }
+            if (element.childNodes) {
+                for (var i = 0; i < element.childNodes.length; i++) {
+                    if (!validate(element.childNodes[i])) {
+                        ret = false;
+                    }
+                }
+            }
+            return ret;
+        }
+
+        function clear(container) {
+            if (container) {
+                while (container.firstChild) {
+                    container.removeChild(container.firstChild);
+                }
+            }
+        }
+
+        function render(titleContainer, container, id, parentObject, propertyProvider, value) {
+            //console.log(id);
+            var schemaId = getSchemaId(id);
+            var s = getSchema(schemaId);
+            renderInfoMap[schemaId] = {};
+            renderInfoMap[schemaId].titleContainer = titleContainer;
+            renderInfoMap[schemaId].container = container;
+            renderInfoMap[schemaId].parentObject = parentObject;
+            renderInfoMap[schemaId].propertyProvider = propertyProvider;
+            renderInfoMap[schemaId].value = value;
+            clear(titleContainer);
+            clear(container);
+            // console.log(s.type, id, s);
+            var r = renderers[s.type];
+            if (r && !s.dependsOn) {
+                if (s.title) {
+                    renderTitle(titleContainer, s.title, s);
+                } else if (propertyProvider) {
+                    renderTitle(titleContainer, propertyProvider.getValue(), s);
+                }
+                if (!value) {
+                    if (typeof initialValue !== "undefined" && initialValue !== null) {
+                        value = getInitialValue(id);
+                    } else {
+                        value = s.default;
+                    }
+                }
+                r(container, id, parentObject, propertyProvider, value);
+            }
+        }
+
+        /**
+         * Used in object additionalProperties and arrays
+         * @param {type} getValue
+         * @param {type} onchange
+         * @returns {Object.create.createPropertyProvider.ret}
+         */
+        function createPropertyProvider(getValue, onchange) {
+            var ret = {};
+            ret.getValue = getValue;
+            ret.onchange = onchange;
+            return ret;
+        }
+
+        function getInitialValue(id) {
+            var ret;
+            try {
+                eval("ret = initialValue" + id.substring(1));
+            } catch (e) {
+                ret = null;
+            }
+            return ret;
+        }
+
+        function getValue(schema, input) {
+            if (typeof input.getValue === "function") {
+                return input.getValue();
+            }
+            var value;
+            if (schema.enum) {
+                value = input.options[input.selectedIndex].value;
+            } else {
+                value = input.value;
+            }
+            if (value === "") {
+                return null;
+            }
+            if (schema.type === "integer") {
+                value = parseInt(value);
+                if (!isFinite(value)) {
+                    value = null;
+                }
+            } else if (schema.type === "number") {
+                value = parseFloat(value);
+                if (!isFinite(value)) {
+                    value = null;
+                }
+            } else if (schema.type === "boolean") {
+                value = input.checked;
+                if (!value) {
+                    value = false;
+                }
+            } else if (schema.type === "any") {
+                if (value) {
+                    eval("value=" + value);
+                }
+            }
+            return value;
+        }
+
+        function getSchemaId(id) {
+            return id.replace(/\["[^"]*"\]/g, "[*]").replace(/\[\d*\]/g, "[#]");
+        }
+
+        function getSchema(schemaId) {
+            return schemaMap[schemaId];
+        }
+
+        function onDependencyChanged(name, source) {
+            function cleanSchemaMap(schemaId) {
+                for (var prop in schemaMap) {
+                    if (schemaId.startsWith(prop)) {
+                        delete schemaMap[prop];
+                    }
+                }
+            }
+
+            function cleanData(schemaId) {
+                var expression = new Expression(schemaId);
+                expression.visit(data, function (data, parent, property) {
+                    delete parent[property];
+                });
+            }
+
+            var arr = dependencyMap[name];
+            if (!arr || !obj.schemaResolver) {
+                return;
+            }
+            var cb = function (schemas) {
+                if (schemas) {
+                    for (var id in schemas) {
+                        if (JSON.stringify(schemaMap[id]) !== JSON.stringify(schemas[id])) {
+                            cleanSchemaMap(id);
+                            cleanData(id);
+                            populateSchemaMap(id, schemas[id]);
+                            var renderInfo = renderInfoMap[id];
+                            if (renderInfo) {
+                                render(renderInfo.titleContainer, renderInfo.container, id, renderInfo.parentObject, renderInfo.propertyProvider, renderInfo.value);
+                            }
+                        }
+                    }
+                }
+                self.onResolutionFinished(source);
+            };
+            self.onResolutionStarted(source);
+            obj.schemaResolver(arr, obj.getData(), cb);
+
+
+        }
+
+        function Expression(exp) {
+            if (exp === null || exp.length === 0 || exp === ".") {
+                exp = "$";
+            }
+            var queue = [];
+            var tokens = parseTokens(exp);
+            var isInBracket = false;
+            var numInBracket = 0;
+            var sb = "";
+            for (var i = 0; i < tokens.length; i++) {
+                var token = tokens[i];
+                if (token === "[") {
+                    if (isInBracket) {
+                        throw ("Error parsing expression '" + exp + "': Nested [ found");
+                    }
+                    isInBracket = true;
+                    numInBracket = 0;
+                    sb = sb + token;
+                } else if (token === "]") {
+                    if (!isInBracket) {
+                        throw ("Error parsing expression '" + exp + "': Unbalanced ] found");
+                    }
+                    isInBracket = false;
+                    sb = sb + token;
+                    queue[queue.length] = sb;
+                    sb = "";
+                } else {
+                    if (isInBracket) {
+                        if (numInBracket > 0) {
+                            throw ("Error parsing expression '" + exp + "': Multiple tokens found inside a bracket");
+                        }
+                        sb = sb + token;
+                        numInBracket++;
+                    } else {
+                        queue[queue.length] = token;
+                    }
+                }
+                if (i === tokens.length - 1) {
+                    if (isInBracket) {
+                        throw ("Error parsing expression '" + exp + "': Unbalanced [ found");
+                    }
+                }
+            }
+            this.exp = exp;
+            this.queue = queue;
+            this.visit = function (data, visitor) {
+                function visit(name, queue, data, parentData, property) {
+                    if (data == null) {
+                        return;
+                    }
+                    var currentToken = queue.shift();
+                    if (currentToken === "$") {
+                        name = "$";
+                        var currentToken = queue.shift();
+                    }
+                    if (!currentToken) {
+                        visitor(data, parentData, property);
+                    } else if (Array.isArray(data)) {
+                        if (!currentToken.startsWith("[")) {
+                            throw ("Node '" + name + "' is of type array");
+                        }
+                        var element = currentToken.substring(1, currentToken.length - 1);
+                        if (element.equals("#")) {
+                            for (var i = 0; i < data.length; i++) {
+                                var child = data[i];
+                                visit(name + currentToken, queue.slice(0), child, data, i);
+                                visit(name + "[" + i + "]", queue.slice(0), child, data, i);
+                            }
+                        } else if (element === "$") {
+                            var child = data[data.length - 1];
+                            visit(name + currentToken, queue.slice(0), child, data, data.length - 1);
+                        } else {
+                            var index = parseInt(element);
+                            if (isNaN(index)) {
+                                throw ("Element '" + element + "' of node '" + name + "' is not an integer, or the '$' last element symbol,  or the wilcard symbol '#'");
+                            }
+                            if (index < 0) {
+                                throw ("Element '" + element + "' of node '" + name + "' is lower than zero");
+                            }
+                            var child = data[index];
+                            visit(name + currentToken, queue.slice(0), child, data, index);
+                        }
+                    } else if ("object" === typeof data) {
+                        if (currentToken === "[*]") {
+                            for (var p in data) {
+                                var child = data[p];
+                                visit(name + currentToken, queue.slice(0), child, data, p);
+                                visit(name + "[\"" + p + "\"]", queue.slice(0), child, data, p);
+                            }
+                        } else {
+                            var child;
+                            if (currentToken.startsWith("[")) {
+                                var element = currentToken.substring(1, currentToken.length - 1);
+                                if (element.startsWith("\"") || element.startsWith("'")) {
+                                    element = element.substring(1, element.length() - 1);
+                                } else {
+                                    throw ("Element '" + element + "' of node '" + name + "' must be a string expression or wilcard '*'");
+                                }
+                                name = name + currentToken;
+                                child = data[element];
+                            } else {
+                                if (name.length > 0) {
+                                    name = name + "." + currentToken;
+                                } else {
+                                    name = currentToken;
+                                }
+                                child = data[currentToken];
+                            }
+                            visit(name, queue, child, data, currentToken);
+                        }
+                    } else if ("boolean" === typeof data
+                        || "number" === typeof data
+                        || "string" === typeof data) {
+                        throw ("Node is leaf but still are tokens remaining: " + currentToken);
+                    } else {
+                        throw ("Node type '" + typeof data + "' not supported for index field '" + name + "'");
+                    }
+                }
+
+                visit(this.exp, this.queue, data);
+            };
+
+            function parseTokens(exp) {
+                if (exp === null) {
+                    return null;
+                }
+                var ret = [];
+                var commentChar = null;
+                var start = 0;
+                for (var i = 0; i < exp.length; i++) {
+                    if (exp.charAt(i) === '"') {
+                        if (commentChar === null) {
+                            commentChar = '"';
+                        } else if (commentChar === '"') {
+                            commentChar = null;
+                            ret[ret.length] = exp.substring(start, i + 1).trim();
+                            start = i + 1;
+                        }
+                    } else if (exp.charAt(i) === '\'') {
+                        if (commentChar === null) {
+                            commentChar = '\'';
+                        } else if (commentChar === '\'') {
+                            commentChar = null;
+                            ret[ret.length] = exp.substring(start, i + 1).trim();
+                            start = i + 1;
+                        }
+                    } else if (exp.charAt(i) === '[') {
+                        if (commentChar === null) {
+                            if (start !== i) {
+                                ret[ret.length] = exp.substring(start, i).trim();
+                            }
+                            ret[ret.length] = "[";
+                            start = i + 1;
+                        }
+                    } else if (exp.charAt(i) === ']') {
+                        if (commentChar === null) {
+                            if (start !== i) {
+                                ret[ret.length] = exp.substring(start, i).trim();
+                            }
+                            ret[ret.length] = "]";
+                            start = i + 1;
+                        }
+                    } else if (exp.charAt(i) === '.') {
+                        if (commentChar === null) {
+                            if (start !== i) {
+                                ret[ret.length] = exp.substring(start, i).trim();
+                            }
+                            start = i + 1;
+                        }
+                    } else if (i === exp.length - 1) {
+                        ret[ret.length] = exp.substring(start, i + 1).trim();
+                    }
+                }
+                return ret;
+            }
+        }
+    };
+    return self;
+}
+
+module.exports = new self();
diff --git a/test/data/test.schema.draft3.json b/test/data/test.schema.draft3.json
new file mode 100644
index 0000000..8c99c1c
--- /dev/null
+++ b/test/data/test.schema.draft3.json
@@ -0,0 +1,330 @@
+{
+  "dynamic": {
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "type": "object",
+    "properties": {
+      "species": {
+        "title": "Species supported",
+        "description": "Changes in this property (`$.species`) trigger the resolution of the actual (depending on the values being selected) schema of a dependent property (`$.subspecies`)",
+        "type": "string",
+        "enum": [
+          "human",
+          "dog",
+          "cat"
+        ],
+        "required": true
+      },
+      "subspecies": {
+        "dependsOn": [
+          "species"
+        ]
+      }
+    }
+  },
+  "simple": {
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "title": "A boolean",
+    "description": "A simple boolean data type as schema root",
+    "type": "boolean"
+  },
+  "complex": {
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "type": "object",
+    "properties": {
+      "pageNum": {
+        "type": "integer",
+        "title": "Page number",
+        "description": "Page number to be queried, `1-based`. See [Pagination](https://en.wikipedia.org/wiki/Pagination) for more details",
+        "default": 1,
+        "required": true
+      },
+      "pageSize": {
+        "type": "integer",
+        "title": "Page size",
+        "description": "Number of records per page",
+        "required": true,
+        "default": 50,
+        "enum": [
+          10,
+          25,
+          50,
+          100
+        ]
+      },
+      "selectedFacetValues": {
+        "type": "array",
+        "title": "Query terms",
+        "minItems": 2,
+        "items": {
+          "description": "Query item",
+          "type": "object",
+          "properties": {
+            "facetName": {
+              "type": "string",
+              "title": "Field name",
+              "description": "Indexed field name",
+              "required": true
+            },
+            "matchAllNull": {
+              "type": "boolean",
+              "title": "Match nulls"
+            },
+            "matchAllNotNull": {
+              "type": "boolean",
+              "title": "Match not nulls"
+            },
+            "facetValues": {
+              "type": "array",
+              "title": "Field values",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "value": {
+                    "type": "string",
+                    "title": "Value"
+                  }
+                }
+              }
+            },
+            "included": {
+              "type": "boolean",
+              "title": "Included"
+            }
+          }
+        }
+      },
+      "sorts": {
+        "type": "array",
+        "title": "Sorting",
+        "items": {
+          "type": "object",
+          "properties": {
+            "fieldName": {
+              "type": "string",
+              "title": "Field name"
+            },
+            "ascending": {
+              "type": "boolean",
+              "title": "Ascending"
+            }
+          }
+        }
+      }
+    }
+  },
+  "initial": {
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "type": "object",
+    "properties": {
+      "pageNum": {
+        "type": "integer",
+        "title": "Page number",
+        "description": "Page number to be queried, `1-based`. See [Pagination](https://en.wikipedia.org/wiki/Pagination) for more details",
+        "default": 1,
+        "required": true
+      },
+      "pageSize": {
+        "type": "integer",
+        "title": "Page size",
+        "description": "Number of records per page",
+        "required": true,
+        "default": 50,
+        "enum": [
+          10,
+          25,
+          50,
+          100
+        ]
+      },
+      "selectedFacetValues": {
+        "type": "array",
+        "title": "Query terms",
+        "minItems": 2,
+        "items": {
+          "description": "Query item",
+          "type": "object",
+          "properties": {
+            "facetName": {
+              "type": "string",
+              "title": "Field name",
+              "description": "Indexed field name",
+              "required": true
+            },
+            "matchAllNull": {
+              "type": "boolean",
+              "title": "Match nulls"
+            },
+            "matchAllNotNull": {
+              "type": "boolean",
+              "title": "Match not nulls"
+            },
+            "facetValues": {
+              "type": "array",
+              "title": "Field values",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "value": {
+                    "type": "string",
+                    "title": "Value"
+                  }
+                }
+              }
+            },
+            "included": {
+              "type": "boolean",
+              "title": "Included"
+            }
+          }
+        }
+      },
+      "sorts": {
+        "type": "array",
+        "title": "Sorting",
+        "items": {
+          "type": "object",
+          "properties": {
+            "fieldName": {
+              "type": "string",
+              "title": "Field name"
+            },
+            "ascending": {
+              "type": "boolean",
+              "title": "Ascending"
+            }
+          }
+        }
+      }
+    }
+  },
+  "string": {
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "type": "object",
+    "properties": {
+      "s1": {
+        "type": "string",
+        "title": "A validated string",
+        "minLength": 1,
+        "maxLength": 2,
+        "pattern": "a",
+        "description": "A string of length `1` or `2` characters long and containing `'a'`"
+      }
+    }
+  },
+  "numeric": {
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "type": "object",
+    "properties": {
+      "num1": {
+        "type": "integer",
+        "title": "A number",
+        "minimum": 1,
+        "maximum": 10,
+        "multipleOf": 3,
+        "description": "An integer multiple of `3`, between `1` and `10` (inclusive)"
+      },
+      "num2": {
+        "type": "integer",
+        "title": "Other number",
+        "minimum": 1,
+        "exclusiveMinimum": true,
+        "maximum": 10,
+        "exclusiveMaximum": true,
+        "description": "A integer between `2` and `9` (inclusive). This example makes use of `exclusiveMinimum` and `exclusiveMaximum` schema keywords"
+      }
+    }
+  },
+  "additional": {
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "type": "object",
+    "properties": {
+      "fixed": {
+        "description": "Object supporting schema-fixed additional properties",
+        "type": "object",
+        "maxProperties": 2,
+        "additionalProperties": {
+          "description": "Fixed-schema additional property",
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "age": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "free": {
+        "description": "Object supporting schema-free additional properties",
+        "type": "object",
+        "maxProperties": 3,
+        "additionalProperties": true
+      }
+    }
+  },
+  "oneOf": {
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "oneOf": [
+      {
+        "type": "number",
+        "required": true,
+        "multipleOf": 3,
+        "title": "A multiple of 3"
+      },
+      {
+        "title": "An object",
+        "type": "object",
+        "properties": {
+          "p1": {
+            "type": "string",
+            "required": true,
+            "title": "A required string"
+          },
+          "p2": {
+            "type": "boolean",
+            "title": "A boolean"
+          }
+        }
+      }
+    ]
+  },
+  "textarea": {
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "type": "object",
+    "properties": {
+      "prop1": {
+        "type": "string",
+        "title": "A short string",
+        "description": "A short string property whose input is rendered as `input`"
+      },
+      "prop2": {
+        "type": "string",
+        "title": "A long text",
+        "format": "text",
+        "description": "A long text property whose input is rendered as `textarea`"
+      }
+    }
+  },
+  "custom": {
+    "$schema": "http://json-schema.org/draft-03/schema#",
+    "type": "object",
+    "properties": {
+      "file": {
+        "type": "string",
+        "format": "inputstream",
+        "description": "Using a custom format decorator with **glyphicon** via `addFormatDecorator(...)` of the bootstrap extension script"
+      },
+      "color": {
+        "type": "string",
+        "format": "color",
+        "description": "Using a custom format decorator via `addFormatDecorator(...)` of the bootstrap extension script"
+      },
+      "date": {
+        "type": "string",
+        "format": "date",
+        "description": "Using a custom format decorator with glyphicon via `addFormatDecorator(...)` of the bootstrap extension script"
+      }
+    }
+  }
+}
diff --git a/test/globals.js b/test/globals.js
new file mode 100644
index 0000000..e69de29
diff --git a/test/index.spec.js b/test/index.spec.js
index 74c4661..df957d7 100644
--- a/test/index.spec.js
+++ b/test/index.spec.js
@@ -1,14 +1,38 @@
 /* global describe it expect assert*/
 
-//var brutusin = require('./src/js/brutusin-json-forms');
-//console.log(9, typeof brutusin);
+var BrutusinForms = require('../src/js/brutusin-json-forms');
+
+var demos = require('./data/test.schema.draft3.json');
+
 
 describe('Testing as node module', function () {
     it('should work with require()', function () {
         "use strict";
+        expect(typeof BrutusinForms).to.equal('object');
+    });
+
+    it('should accept JSON and create a form', function(){
+        "use strict";
+        var schema = demos['numeric'];
+        var form = BrutusinForms.create(schema);
+        expect(typeof form).to.equal('object');
 
-        expect(typeof brutusin).to.equal('object');
     });
 
 
+
 });
+
+
+
+//TODO:
+//  "Objects, arrays, enums, default, required, minItems"
+//"Example covering several common features"
+// "Example of a form created with initial data preloaded. Same schema as the previous example."],
+//  "[String validation](http://json-schema.org/latest/json-schema-validation.html#anchor25) supporting `minLength`, `maxLength`, and `pattern`"],
+//  "Both object and boolean typed [additionalProperties](http://json-schema.org/latest/json-schema-validation.html#anchor64) are supported. Also, notice the support of the validation keywords `minProperties` and `maxProperties`"],
+
+//  "`oneOf` types support in schemas"
+//  "`textarea` rendering for `string` schemas"],
+// ["Custom string formats",
+// "Input types can be chosen for custom `string` schema formats via `BrutusinForms.bootstrap.addFormatDecorator(...)`. See current registered decorators at this page source code."]