Added back more classes