Add UID support