Improved WP8 support