Added validation for not enough validity