Change Native per #347