Updated autoload order (for legacy)