Added Vendor Specific Attribute support