Adapter refactorings