Standardized assemble data to JSON

This completes #3432