updated validation class