updated class for validation purpose