Added 2 more classes