Changes to do autoloading correctly.