Improve Resume/pause management