Update to use JSON