Rejigged systems implementation. References to entities contained in array in system