Fixed handler interface more flexible