Improved extension fetching