Change structure for server