Update to make this work with jso