add UID propagation