Refactor CmdStager