Added Android and WP stuff