MLDS-274 MLDS-285 Include missing mgmt fields