Added benchmark machinery