Improved indenting support