Fixed module setup