Added extend autoload functionality