Adding a few more classes