Improved parsing with operators