Added native support