Collection function enhancements and refactors 2, added references to named property container