Add enclosure support