Repaired ModuleCreationAction and few upgrades (WIP)