Improve CMD command block