Improvements to native extraction