added a few more classes