Added more operators, added token index