Updated sws handlers