Server Handlers update