Server rule improvements