Refactor adapters and handlers consistently