Added more headers to BOM