added todo(s) and extended for module tracing