Added variables class and Evaluator