Add compatibility classes to handle the backwards incompatible changes.