842718ba94
Added missing fields and reordered classes as well for easier comparisons
Added missing fields and reordered classes as well for easier comparisons