Add "required" check