GenericCommand and HeaderCommand added