Add hyphens support

Could define more vendor properties than needed