Add pause and resume support