Reduce public API surface