Added Selector Handling of Server/Client