I2C Support improvements