Modify further all classes and interfaces