Added native app support