More data, added support for autoloaders.