Cleaned up public interface