Included more classes