API refactors