Added more new classes