Added support to modify and re-init handlers