Update to use the newest handler api