Lets add UUID support

First step to UUID support.