replace ModuleStore.get with System.get