More API refactoring.