Improvements for nativesdk