Updating to work with autoloading.