Improve public API