Add session saved state to each modules #20