Changed the handler interface.