Updated vendor code