Refactoring nos Adapters