Updated GWJSON so cast is unnecessary