Module instrumentation [fix #3]