Improved support for sonos