Refactoring and Sonos working for multi-interrupt and resume