Adding average and throughput options