Change ICommand interface and commands