Added typed json support