Adaptor refactoring in progress