Make more portable (Add Windows Phone 8.1).