Switch to proper autoloading