Improve Extract path