Update to make generic build IOS and Android