Improved Windows Phone 8 support