Changed much thingies to make autoloading better