Parser modifications