[Server] - Lots of changes