Added code folding back into json