Added a bunch of submodules for extended features