Adding some new classes