Improve server instance