Add compatibility classes to handle the backwards incompatible changes.
Merge pull request #237 from apenney/backwards-compat

Add compatibility classes to handle the backwards incompatible changes.