Removed UUID dependency