Another round of adding module interdependencies