Updated handling server data