Continuation handler refactored