Add initial json support