Introduce Evaluation and change a bit the api