New API for 1.1, improved benchmark a bit.