Added some classes back