Updated all remaining classes to new config + added few more classes