Adding additional validation.