Revert "Worked on BOMs"

This reverts commit a2125976a54354ab525f3884e5189c7120c6e01c.
Revert "Revert "Worked on BOMs""

This reverts commit 5e8def40d806edfa2d7bb324aa1a0e359af96b65.