Updated class list

Change-Id: Ic555cadc1a3d157bf0735540132c155a9d52221f