Updated grammar to support indentation