add WaterspoutHandler