Added UUID wrapper