Improve server Class