Improve public interface