Created more classes