Further refactor the bundle autoloading