- Continue Handler refacto