Refactor evaluator to accept List