server data refactoring