Expanding with additional commands
Minor refactoring