Added support for vendor-dir