Added attributes for reordering json properties for simpler reading. Fixed nullcheck that was at the wrong place