Added instrumentation to other calculators