Added first version of the validation class