Changes to CommandBase