Use immutable list in a few places.
Add UUID fields.