Added some new classes