Add UUID via context passing