Switch to UUID