Initial UUID support. May work?