Add UID parsing