Proper "native" detection added