Refactor to use autoloaded.