Working on Windows Phone 8 support