Major revamp of compatibility classes.