Overhaul of the validation components