Better handling of Pause and Resume events