Improved JSON-RPC support