Update public interface #22