#41 Replaced Command in CommandBuilder