Reordered json creation

Quickly changed json creation order so that you can override most
fields with the MDC should you choose.