Added check for UID