Update for new benchmark-tool