Fixed adapter calls in submodules