API: Refactoring.