Also update the public interface