Proper savestate support