Do we need to expose this on the public API?