Add expansions for system commands
Implement expansions for system commands and quad commands