Improve BOM and add links