Move session field to the bottom to preserve binary compatibility