Replaced all classes that were removed previously