Updated s.w.s. handlers