Added two more classes