Some classes has been modified