CFY-1373 refactor source/target context creation