Use containment references only where necessary