#73 Improve statistics instrumentation