improved native version support