API Management refactor