Added Enclosure class