Fix bug in the upgrader
Use the autoloader