API Manager Refactoring.