Improved extension matching
Rebuild