Changing Autoload to more modern Solution