Internal API refactors