Added option to enable vendor configuration