More refactoring to add more commands