Feature/instrumentation improvements