Make bundle a struct, creade UUID earlier and avoid weird renames.