UUID Refactor