Add OTUHandler and update OTUListener