New ideas
Refactoring of code instrumentation