More API refactoring with Dejan.
More API refactoring with Dejan