Add more submodules
Merge with master