Added special-purpose 'enclosure' entries