Added auto-instrumenting.