Add support for enclosures