Fixed module instantiation