Added enclosure and lid modules