Generalised some of the evaluators + agent parcels