Extract sub-class to top-level to mirror other adapter impls