Added more classes, thanks to Cavila

Change-Id: I1ef74bcadadec4cafd0ff2ccb1deba7fb8825fe4