This methods (add, remove, clear) are not private in the BaseServer, should be private there too?