Added more classes.

+ No code yet