Make bench a little bit more configurable