Better support for Windows Phone 8