More public interface changes (Server)