Change the return type to JsValue