Done some changes in OperatorToken and Evaluate files