Added some more to the Sonos part