Updated handler interface