Align field ordering to flow from base class