Expose more public API