Added several classes