add vendor-specific fields, closes #2