Updating autoload to prevent duplicate