Adding control and pap benchmark options