Better job saving state