add Id to exported modules
Merge branch 'master' into nodeps