Add better control of auto indent