Enhance the autoloading so it covers all use cases