JSON Enhancements

Primary tabs