Updated validator script