Changed how to initialize sub-modules