Change server data from definition to function call