API Refactoring.