Refactor Configuration
Not allow direct manipulation to adapters