Expose more internal state