Refactoring requirements to account for autoloader.