Added support for vendor specific properties