Reorder some context fields and remove unnecessary update parameters