Code folding updates