Re-added autoload section