Grouped module commands and added missing