[TASK] Remove mapping for ModuleItems