Adapter factories improved