Vendor added into DatabaseConfiguration (fixes #696)