Autoloader rewritten (more flexible now)