Added savestate and groups