Adding set up for autoload