Added handling for JsonUnwrapped properties