Fixing old classes configuration