Updated to use UUID