Switch to UUID ids