[#64388118] Add new classes.