EF-26 Added new submodules