decomposed mapping collector
Updated extension to work with decoupled mapping collector