Added preliminary json support