Changes to reflect latest changes in CommandBox