New section: Adapters and some refactoring