Modified JSON implementation