Refactor adapters