Add new modules
Misc modifications
Update submodules