FIX Use CSV strings for type and vendor keys