Changed autoload functionality.