TEIIDRHQ-18 - changes to use common BOM's and from data services to data virtualization