Added some basic methods and changed some class names