Implemented expansion indentation and context stack