Added validation class