ConfigAdapter refactored