Improve server implementation