Working on BDD #266
Updating vendors