Added multiple classes and functionalities