Master server script improvement