new structure
fix adapters