Added Pause/Cancel support