Fixed module interdependencies