Added ValidateCommand and move ItemExtender