Update

Integration and manufacturer fixes