Added partial json support