Add pause and stop support