Refactor continuation