Modify some classes