Added multiple savestate support