BATCHEE-5 metrics for partitionned steps + few cleanup in diagram task