Tightening up the public interface a little bit more