Added state save/recover for more types.