extract containment handler
further refactor mapping handlers