Evaluator management

Fix #1