ModuleMappers updated