Added code folding