Added WP8 support