API refactorings