Continuation handler refactoring finished