MODE-2092 Restructured and simplified BOMs.