Added support for enclosures