Add better helm autoloading