Adding functionality back to benchmark