Revised colletion module for new interpreter types