add UIDValidity support