change controller to use UUID