Introduced RoutineAdapter
Moved all the adapters to common base
Context based construction
ff