Refactoring to make everything NSUUID