Hopefully new classes work now.

It needs testing, but I think the new classes will be used correctly.