Update listeners to include vendor