Changed structures to better fit snapshots.