Adding parsing of BOM.
nits