fix old code. extended consumers
adapters