PIM-2272: Use reference instead of container