[Server] Big Improvements