Update SetupCommands function