refactor JSON reads/writes
Refactor traits aggregation
Almost there...