API: Finish base refactoring.