Added vendor override to locations