Updates to adjust for changes in JsFunction libary