Added enclosure class