Refactor to access collection info only through accessors