Refactor adapter