added some new classes