Added useBBvsB flag
Add new xmls