Added some more classes and functions