Changed iOS and Android generator