Refactor of EvalutionLink