Hierarchical object keys

Where applicable, the object keys in the tables are structured in a hierarchical manner. This has the following benefits: