Update to use UUID's