Added JSON-RPC support