Lets add UUID support