Change field refs for better decoding
Contribution de-serialization changes