Latest changes to validator