Make internals public