Updated autoload and submodules