Better instrumentation
Fix mixed module out [fix #48]