Public API finished