Start collecting data with those modules as well
Start collecting data with those modules as well
Fixes #1143