Fixed nestedFields on JSON generation
Added missing properties