Performance improvements for autoload generator