Added support for WP8 devices