Major update through all the classes