Updated enclosure parsing