Changed to UUID and some other stuff.

Updated to use UUID