Add class

Change-Id: I2714028c2cbdac0e4dc2c3400c892807b0c81a1b