Merged changes in Server.cs