grouped operators, added more keywords