Magtools refactoring -  autoloading improvements