Moving some things to the public API