Improved extension loading