Change handler and add reconnecting listener