Improve the way jso objects are supported