Added some classes and packages