Change validator to refer to the system ID