Add a little more instrumentation