Don't always load

Update autoload to only load when needed.