renamed expression container -> collector