Update to UUID code