Better JSON nesting