Followed environment event refactor in CommandHelper.