Updated extension to work with decomposed mapping collector