Cleanup metadata; add enum-based data-types.
Add details groups; Group details are still incomplete.