UUID/User rework