API refactoring.