Use new native api