Change TCGen flag to Dictionary, update evaluator accordingly