refactoring (preparation for adapters building)
adapter synthesis half-done