Rename ServerID to GroupID for the sake of understanding, More cleanup