Refactor Adapter