Added cmds and pkgs