adjust to Management API changes