Add preliminary UUID support