Added loc & cpd with exclusion for vendor