Made some internals public