Add pause and continue support