Added the validation