Better design for raw attributes
Simplifying design
Simplifying even more