Fix remember generated UUID
Update fields