Cookie decorator and explict command check restored