Updated with the latest validator changes