Removed vendorId from Address