XD-2198: CompositeModuleRegistry

Introduce new types