Modify classes