More API refactoring with Dejan