* Adapter refactoring WIP