Do we really need this as a public interface?