Work on public API