Completing server implementation