Added more classes ^_^