Changed to UUID and some other stuff.