[Adapter] refinement and modularity.