Adjust to new DataModel JsvaScript