Added additional validation