Improved and correct autoloading