API refactor.