Added wp8 support