Improve indent support