Added .modules startup support