Extracted common server elements
Improved support for switching client handling strategies
Removed unused import