S8831 - Adding support for Manufacturer